summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorDavid Callahan <dcallahan@fb.com>2019-01-14 18:49:27 +0000
committerDavid Callahan <dcallahan@fb.com>2019-01-14 18:49:27 +0000
commitb1853a6a9434b435b0325507504d056c4f93bada (patch)
treeef5209b1f18d5699bfdf9fe7dac9747c21a00b3d /llvm/lib
parenta0946dc7402c4886fa2a0593724adbc3a742528d (diff)
downloadbcm5719-llvm-b1853a6a9434b435b0325507504d056c4f93bada.tar.gz
bcm5719-llvm-b1853a6a9434b435b0325507504d056c4f93bada.zip
Revert "Merge branch 'arcpatch-D55094'"
This reverts commit a9788dd6587d67c856df74eedff5a6ad34ce8320, reversing changes made to f1309ffebf718d16aec4fab83380556c660e2825. unintended merge pushed llvm-svn: 351095
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Transforms/IPO/SampleProfile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Transforms/IPO/SampleProfile.cpp b/llvm/lib/Transforms/IPO/SampleProfile.cpp
index 1e86e04a79d..06a1ce89827 100644
--- a/llvm/lib/Transforms/IPO/SampleProfile.cpp
+++ b/llvm/lib/Transforms/IPO/SampleProfile.cpp
@@ -544,10 +544,10 @@ ErrorOr<uint64_t> 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<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
OpenPOWER on IntegriCloud