Commit b407888

committed

resolve merge conflict

2 parents 6ba783c + 7d4ea77 commit b407888Copy full SHA for b407888

11,436 files changed

+732686

-540554

lines changed

.ci
.github
- new-prs-labeler.yml
- workflows
bolt
- include/bolt
  - Core
  - Passes
  - Rewrite
    - RewriteInstance.h
  - Utils
    - CommandLineOpts.h
- lib
  - Core
  - Passes
  - Rewrite
    - MachORewriteInstance.cpp
    - RewriteInstance.cpp
  - Target
    - AArch64
    - RISCV
      - RISCVMCPlusBuilder.cpp
    - X86
      - X86MCPlusBuilder.cpp
  - Utils
    - CommandLineOpts.cpp
- test
- unittests/Core
  - MCPlusBuilder.cpp
clang-tools-extra
- clang-doc
  - HTMLGenerator.cpp
  - MDGenerator.cpp
  - Representation.cpp
  - Representation.h
  - assets
    - index.js
  - tool
    - ClangDocMain.cpp
- clang-move
  - Move.cpp
- clang-tidy
- clangd
  - AST.cpp
  - ClangdServer.cpp
  - CodeComplete.cpp
  - CodeComplete.h
  - Config.h
  - ConfigCompile.cpp
  - ConfigFragment.h
  - ConfigYAML.cpp
  - DumpAST.cpp
  - FindTarget.cpp
  - HeaderSourceSwitch.cpp
  - Headers.cpp
  - ModulesBuilder.cpp
  - Preamble.cpp
  - SystemIncludeExtractor.cpp
  - index/dex
    - Dex.cpp
    - dexp
      - Dexp.cpp
  - refactor
    - Rename.cpp
    - Rename.h
    - tweaks
      - ExtractVariable.cpp
  - tool
    - ClangdMain.cpp
  - unittests
- docs
  - ReleaseNotes.rst
  - clang-tidy/checks
- include-cleaner/lib
  - WalkAST.cpp
- modularize
- test
  - clang-doc
    - DR-131697.cpp
    - Inputs/basic-project/src
    - assets.cpp
    - basic-project.test
    - enum.cpp
    - namespace.cpp
    - single-file-public.cpp
    - single-file.cpp
    - templates.cpp
    - test-path-abs.cpp
  - clang-tidy
    - check_clang_tidy.py
    - checkers
    - infrastructure/header-filter-from-config-file
      - inheritance
        .clang-tidy
        foo.cpp
        foo.h
        subfolder
        .clang-tidy
        bar.cpp
        bar.h
      - simple
        .clang-tidy
        foo.cpp
        foo.h
- unittests/clang-doc
  - HTMLGeneratorTest.cpp
clang
cmake/Modules
- FindLibcCommonUtils.cmake
- FindPrefixFromConfig.cmake
compiler-rt
- CMakeLists.txt
- cmake
  - Modules
    - AddCompilerRT.cmake
    - CompilerRTUtils.cmake
  - builtin-config-ix.cmake
- include/profile
  - InstrProfData.inc
  - instr_prof_interface.h
- lib
  - asan
  - builtins
    - CMakeLists.txt
    - cpu_model
      - AArch64CPUFeatures.inc
      - aarch64
        fmv
        mrs.inc
        hwcap.inc
  - ctx_profile
  - hwasan
    - hwasan_globals.cpp
  - interception
    - interception_win.cpp
    - tests
      - interception_win_test.cpp
  - memprof
    - memprof_flags.h
  - msan/tests
    - msan_test.cpp
  - orc
  - profile
  - rtsan
    - rtsan_interceptors_posix.cpp
    - tests
      - rtsan_test_interceptors_posix.cpp
  - sanitizer_common
  - scudo/standalone
    - secondary.h
  - tsan/rtl
    - tsan_interceptors_posix.cpp
- test
  - CMakeLists.txt
  - asan
    - TestCases
    - lit.cfg.py
  - ctx_profile/TestCases
    - generate-context.cpp
  - lit.common.cfg.py
  - lit.common.configured.in
  - metadata
    - lit.cfg.py
  - profile
  - sanitizer_common
    - TestCases
      - Darwin
        malloc_zone.cpp
      - Linux
        getservent_r.cpp
        preadv2.cpp
      - disable_symbolizer_path_search.cpp
    - lit.common.cfg.py
  - tsan
    - Darwin
      - no_call_setenv_in_symbolize.cpp
    - Linux
      - clone_setns.cpp
    - cxa_guard_acquire.cpp
  - tysan
    - lit.cfg.py
cross-project-tests
- debuginfo-tests
  - dexter-tests
  - dexter/feature_tests
    - commands
      - penalty
        dex_declare_file.cpp
        expect_program_state.cpp
        expect_step_kinds.cpp
        expect_step_order.cpp
        expect_watch_type.cpp
        expect_watch_value.cpp
        float_range_out_range.cpp
        float_range_zero_nonmatch.cpp
        missing_dex_address.cpp
        unreachable.cpp
        unreachable_line_range.cpp
        unreachable_on_line.cpp
      - perfect
        command_line.c
        dex_declare_address
        address_after_ref.cpp
        address_hit_count.cpp
        expression_address.cpp
        identical_address.cpp
        multiple_address.cpp
        offset_address.cpp
        self_comparison.cpp
        dex_declare_file
        dex_and_source
        test.cpp
        precompiled_binary
        commands.dex
        windows_noncanonical_path
        test.dex
        dex_finish_test
        default_conditional.cpp
        default_conditional_hit_count.cpp
        default_hit_count.cpp
        default_simple.cpp
        limit_steps_conditional.cpp
        limit_steps_conditional_hit_count.cpp
        limit_steps_hit_count.cpp
        limit_steps_simple.cpp
        expect_program_state.cpp
        expect_step_kind
        direction.cpp
        func.cpp
        func_external.cpp
        recursive.cpp
        small_loop.cpp
        expect_step_order.cpp
        expect_watch_type.cpp
        expect_watch_value.cpp
        float_range_watch
        float_range_multiple.cpp
        float_range_no_arg.cpp
        float_range_small.cpp
        float_range_zero_match.cpp
        limit_steps
        hit_count.cpp
        limit_steps_check_json_step_count.cpp
        limit_steps_expect_loop.cpp
        limit_steps_expect_value.cpp
        limit_steps_line_mismatch.cpp
        limit_steps_overlapping_ranges.cpp
        limit_steps_same_line_conditional.cpp
        unconditional.cpp
        unreachable.cpp
        unreachable_not_cmd_lineno.cpp
        unreachable_on_line.cpp
    - subtools
      - test
        address_printing.cpp
        err_bad_label_ref.cpp
        err_duplicate_address.cpp
        err_duplicate_label.cpp
        err_paren.cpp
        err_paren_mline.cpp
        err_syntax.cpp
        err_syntax_dexdeclarefile.cpp
        err_syntax_mline.cpp
        err_type.cpp
        err_type_mline.cpp
        err_undeclared_addr.cpp
        label_another_line.cpp
        label_offset.cpp
        source-root-dir.cpp
        target_run_args.c
        target_run_args_with_command.c
      - view.cpp
  - llgdb-tests
    - llgdb.py
    - test_debuginfo.pl
- lit.cfg.py
- tools/llvm-objdump/ARM
  - lit.local.cfg
  - plt.c
flang-rt
- CMakeLists.txt
- cmake
  - modules
  - quadmath_wrapper.h.in
- include/flang-rt/runtime
  - descriptor.h
  - environment.h
- lib
- unittests/Runtime
flang
libc
- CMakeLists.txt
- Maintainers.rst
- cmake/modules
- config
  - baremetal
    - aarch64
      - entrypoints.txt
    - arm
      - entrypoints.txt
    - riscv
      - entrypoints.txt
  - config.json
  - darwin
    - arm
      - entrypoints.txt
    - x86_64
      - entrypoints.txt
  - gpu
    - amdgpu
      - config.json
      - entrypoints.txt
    - nvptx
      - config.json
      - entrypoints.txt
  - linux
    - aarch64
      - entrypoints.txt
      - headers.txt
    - arm
      - entrypoints.txt
    - riscv
      - entrypoints.txt
    - x86_64
      - entrypoints.txt
  - uefi
  - windows
    - entrypoints.txt
- docs
  - CMakeLists.txt
  - Maintainers.rst
  - configure.rst
  - getting_started.rst
  - gpu
    - rpc.rst
  - headers
    - index.rst
    - math
      - index.rst
    - stdfix.rst
  - index.rst
  - uefi
- hdr
- include
  - CMakeLists.txt
  - Uefi.yaml
  - link.h.def
  - link.yaml
  - llvm-libc-macros
    - linux
      - sched-macros.h
    - stdfix-macros.h
  - llvm-libc-types
  - math.yaml
  - search.yaml
  - stdfix.yaml
  - stdlib.yaml
  - strings.yaml
  - sys
    - time.yaml
- shared
- src
- test
  - UnitTest
  - integration
    - src/pthread
      - pthread_rwlock_test.cpp
    - startup/gpu
      - rpc_stream_test.cpp
      - rpc_test.cpp
  - src
    - __support
    - complex
      - CImagTest.h
      - CRealTest.h
    - fcntl
      - openat_test.cpp
    - locale
    - math

11,436 files changed

+732686

-540554

lines changed

`‎.ci/compute-projects.sh‎`

This file was deleted.

Comments

(0)