[llvm] r351095 - Revert "Merge branch 'arcpatch-D55094'"

[Roman Lebedev via llvm-commits]

On Mon, Jan 14, 2019 at 9:53 PM David Callahan via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: david2050
> Date: Mon Jan 14 10:49:27 2019
> New Revision: 351095
>
> URL: http://llvm.org/viewvc/llvm-project?rev=351095&view=rev
> Log:
> Revert "Merge branch 'arcpatch-D55094'"
>
> This reverts commit a9788dd6587d67c856df74eedff5a6ad34ce8320, reversing
> changes made to f1309ffebf718d16aec4fab83380556c660e2825.
... and you should the ./utils/git-svn/git-svnrevert to do these reverts,
so you end up with proper svn commit numbers in the log.

> unintended merge pushed
>
> 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=351095&r1=351094&r2=351095&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp Mon Jan 14 10:49:27 2019
> @@ -544,10 +544,10 @@ ErrorOr<uint64_t> SampleProfileLoader::g
>    if (!FS)
>      return std::error_code();
>
> -  // Ignore all intrinsics, phinodes and branch instructions.
> -  // Branch and phinodes instruction usually contains debug info from sources outside of
> +  // Ignore all intrinsics and branch instructions.
> +  // Branch 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) || isa<PHINode>(Inst))
> +  if (isa<BranchInst>(Inst) || isa<IntrinsicInst>(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