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

[David Callahan via llvm-commits]

Thanks very much
Sorry for the errors

On 1/14/19, 11:03 AM, "Roman Lebedev" <lebedev.ri at gmail.com> wrote:

    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: https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D351095-26view-3Drev&d=DwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=lFyiPUrFdOHdaobP7i4hoA&m=4o9tic9ufnQH6bdo_EtC8VJf2S6Nzh12gZpVjPnyjwc&s=SBEPhpO9iroDlxuBfSssAqbIWszz6dXO6mch5NuriUM&e=
    > 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: https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_lib_Transforms_IPO_SampleProfile.cpp-3Frev-3D351095-26r1-3D351094-26r2-3D351095-26view-3Ddiff&d=DwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=lFyiPUrFdOHdaobP7i4hoA&m=4o9tic9ufnQH6bdo_EtC8VJf2S6Nzh12gZpVjPnyjwc&s=9dNRbOlyZay0GgFRCshqXWZAujhmUdG9CYknBgYgC5o&e=
    > ==============================================================================
    > --- 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
    > https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_llvm-2Dcommits&d=DwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=lFyiPUrFdOHdaobP7i4hoA&m=4o9tic9ufnQH6bdo_EtC8VJf2S6Nzh12gZpVjPnyjwc&s=Jjs8sHoVHBUaz73Jepik7-RaHzlBar9iZdbM1enLIiM&e=