diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp index e55eaa55f8e94..c75460f44c1d9 100644 --- a/llvm/lib/Analysis/InlineCost.cpp +++ b/llvm/lib/Analysis/InlineCost.cpp @@ -800,7 +800,7 @@ class InlineCostCallAnalyzer final : public CallAnalyzer { return false; } else { // Otherwise, require instrumentation profile. - if (!(PSI->hasInstrumentationProfile() || PSI->hasSampleProfile())) + if (!PSI->hasInstrumentationProfile()) return false; } diff --git a/llvm/test/Transforms/SampleProfile/remarks-hotness.ll b/llvm/test/Transforms/SampleProfile/remarks-hotness.ll index b90b21e9e3c58..36fb3c5818170 100644 --- a/llvm/test/Transforms/SampleProfile/remarks-hotness.ll +++ b/llvm/test/Transforms/SampleProfile/remarks-hotness.ll @@ -24,7 +24,7 @@ ; YAML-PASS: --- !Passed ; YAML-PASS-NEXT: Pass: inline -; YAML-PASS-NEXT: Name: AlwaysInline +; YAML-PASS-NEXT: Name: Inlined ; YAML-PASS-NEXT: DebugLoc: { File: remarks-hotness.cpp, Line: 10, Column: 10 } ; YAML-PASS-NEXT: Function: _Z7caller1v ; YAML-PASS-NEXT: Hotness: 401 @@ -36,7 +36,7 @@ ; YAML-MISS-NEXT: Function: _Z7caller2v ; YAML-MISS-NEXT: Hotness: 2 -; CHECK-RPASS: '_Z7callee1v' inlined into '_Z7caller1v' with (cost=always): benefit over cost at callsite _Z7caller1v:1:10; (hotness: 401) +; CHECK-RPASS: '_Z7callee1v' inlined into '_Z7caller1v' with (cost=-30, threshold=4500) at callsite _Z7caller1v:1:10; (hotness: 401) ; CHECK-RPASS-NOT: '_Z7callee2v' not inlined into '_Z7caller2v' because it should never be inlined (cost=never): noinline function attribute (hotness: 2) ; ModuleID = 'remarks-hotness.cpp'