[all-commits] [llvm/llvm-project] fed413: Revert "Revert "[Coverage] Fix branch coverage mer...

[Tom Stellard via All-commits]

  Branch: refs/heads/release/12.x
  Home:   https://github.com/llvm/llvm-project
  Commit: fed41342a82f5a3a9201819a82bf7a48313e296b
      https://github.com/llvm/llvm-project/commit/fed41342a82f5a3a9201819a82bf7a48313e296b
  Author: Tom Stellard <tstellar at redhat.com>
  Date:   2021-06-28 (Mon, 28 Jun 2021)

  Changed paths:
    M llvm/test/tools/llvm-cov/branch-templates.cpp
    M llvm/tools/llvm-cov/CoverageSummaryInfo.cpp
    M llvm/tools/llvm-cov/CoverageSummaryInfo.h

  Log Message:
  -----------
  Revert "Revert "[Coverage] Fix branch coverage merging in FunctionCoverageSummary::get() for instantiation""

This reverts commit 33d312b2d731507327252fd597bac1b738870330.

The original patch was correct, so we need to restore it in the
release branch.