From 89cc3836e56c1144e8e5444155da4586357a89bb Mon Sep 17 00:00:00 2001 From: David Callahan Date: Mon, 14 Jan 2019 18:49:27 +0000 Subject: [PATCH] Revert "Merge branch 'arcpatch-D55094'" This reverts commit a9788dd6587d67c856df74eedff5a6ad34ce8320, reversing changes made to f1309ffebf718d16aec4fab83380556c660e2825. unintended merge pushed git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351095 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 1e86e04a79d..06a1ce89827 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, 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(Inst) || isa(Inst) || isa(Inst)) + if (isa(Inst) || isa(Inst)) return std::error_code(); // If a direct call/invoke instruction is inlined in profile -- 2.50.1