[all-commits] [llvm/llvm-project] 319eb6: Merge branches 'users/chapuni/mcdc/nest/lnot' and ...

[NAKAMURA Takumi via All-commits]

  Branch: refs/heads/users/chapuni/mcdc/nest/trunk
  Home:   https://github.com/llvm/llvm-project
  Commit: 319eb6cbf5011ab45f86f70fa0f67cffa58c4e48
      https://github.com/llvm/llvm-project/commit/319eb6cbf5011ab45f86f70fa0f67cffa58c4e48
  Author: NAKAMURA Takumi <geek4civic at gmail.com>
  Date:   2025-02-02 (Sun, 02 Feb 2025)

  Changed paths:
    M clang/include/clang/AST/IgnoreExpr.h
    M clang/lib/CodeGen/CodeGenFunction.cpp
    M clang/test/CoverageMapping/mcdc-nested-expr.cpp

  Log Message:
  -----------
  Merge branches 'users/chapuni/mcdc/nest/lnot' and 'users/chapuni/mcdc/nest/expect' into users/chapuni/mcdc/nest/trunk

Conflicts:
	clang/include/clang/AST/IgnoreExpr.h
	clang/lib/CodeGen/CodeGenFunction.cpp


  Commit: 9f6928d0372989ebae6fe0f107fd2ec3de0ecf76
      https://github.com/llvm/llvm-project/commit/9f6928d0372989ebae6fe0f107fd2ec3de0ecf76
  Author: NAKAMURA Takumi <geek4civic at gmail.com>
  Date:   2025-02-02 (Sun, 02 Feb 2025)

  Changed paths:
    M clang/lib/CodeGen/CGExprScalar.cpp
    M clang/lib/CodeGen/CodeGenFunction.cpp
    M clang/lib/CodeGen/CodeGenFunction.h
    M clang/lib/CodeGen/CodeGenPGO.cpp
    M clang/lib/CodeGen/CodeGenPGO.h
    M clang/lib/CodeGen/CoverageMappingGen.cpp
    M clang/lib/CodeGen/MCDCState.h
    M clang/test/CoverageMapping/ctor.cpp
    M clang/test/CoverageMapping/includehell.cpp
    M clang/test/CoverageMapping/macros.c
    M clang/test/CoverageMapping/mcdc-nested-expr.cpp
    M clang/test/CoverageMapping/mcdc-single-cond.cpp
    M clang/test/Frontend/custom-diag-werror-interaction.c
    M clang/test/Profile/c-mcdc-logicalop-ternary.c
    M llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
    M llvm/lib/ProfileData/Coverage/CoverageMappingWriter.cpp

  Log Message:
  -----------
  Merge branch 'users/chapuni/mcdc/nest/nest' into users/chapuni/mcdc/nest/trunk


Compare: https://github.com/llvm/llvm-project/compare/319eb6cbf501%5E...9f6928d03729

To unsubscribe from these emails, change your notification settings at https://github.com/llvm/llvm-project/settings/notifications