From ad1cf6ea639aebb3d2f682fb40bc0aaa3a75007a Mon Sep 17 00:00:00 2001 From: David Callahan Date: Mon, 14 Jan 2019 18:35:43 +0000 Subject: [PATCH] Merge branch 'arcpatch-D55094' git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351092 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/SampleProfile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Transforms/IPO/SampleProfile.cpp b/lib/Transforms/IPO/SampleProfile.cpp index 06a1ce89827..1e86e04a79d 100644 --- a/lib/Transforms/IPO/SampleProfile.cpp +++ b/lib/Transforms/IPO/SampleProfile.cpp @@ -544,10 +544,10 @@ ErrorOr SampleProfileLoader::getInstWeight(const Instruction &Inst) { 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(Inst) || isa(Inst)) + if (isa(Inst) || isa(Inst) || isa(Inst)) return std::error_code(); // If a direct call/invoke instruction is inlined in profile -- 2.11.0