[llvm] r351092 - Merge branch 'arcpatch-D55094'

[Roman Lebedev via llvm-commits]

I think you will want to revert this, and do a proper commit.
It is explicitly stated in the docs to do fast-forward merges, not
branch merges.

Roman.

On Mon, Jan 14, 2019 at 9:39 PM David Callahan via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: david2050
> Date: Mon Jan 14 10:35:43 2019
> New Revision: 351092
>
> URL: http://llvm.org/viewvc/llvm-project?rev=351092&view=rev
> Log:
> Merge branch 'arcpatch-D55094'
>
> Modified:
>     llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp
>
> Modified: llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp?rev=351092&r1=351091&r2=351092&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp Mon Jan 14 10:35:43 2019
> @@ -544,10 +544,10 @@ ErrorOr<uint64_t> SampleProfileLoader::g
>    if (!FS)
>      return std::error_code();
>
> -  // Ignore all intrinsics and branch instructions.
> -  // Branch instruction usually contains debug info from sources outside of
> +  // Ignore all intrinsics, phinodes and branch instructions.
> +  // Branch and phinodes instruction usually contains debug info from sources outside of
>    // the residing basic block, thus we ignore them during annotation.
> -  if (isa<BranchInst>(Inst) || isa<IntrinsicInst>(Inst))
> +  if (isa<BranchInst>(Inst) || isa<IntrinsicInst>(Inst) || isa<PHINode>(Inst))
>      return std::error_code();
>
>    // If a direct call/invoke instruction is inlined in profile
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits