aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Analysis/InlineCost.cpp
diff options
context:
space:
mode:
authorAkira Hatanaka <ahatanaka@apple.com>2015-12-22 20:29:09 +0000
committerAkira Hatanaka <ahatanaka@apple.com>2015-12-22 20:29:09 +0000
commit9c05cc5670f8d77fd71d10fb6ba60b9939aa498a (patch)
tree9ca9ed50e748fa0a0e23863b50745c99e5c544e6 /llvm/lib/Analysis/InlineCost.cpp
parent3f1bf25db162a95dbe554e56c89c743ce40031be (diff)
downloadllvm-9c05cc5670f8d77fd71d10fb6ba60b9939aa498a.zip
llvm-9c05cc5670f8d77fd71d10fb6ba60b9939aa498a.tar.gz
llvm-9c05cc5670f8d77fd71d10fb6ba60b9939aa498a.tar.bz2
Revert r256277 and r256279.
Some of the bots failed again. llvm-svn: 256280
Diffstat (limited to 'llvm/lib/Analysis/InlineCost.cpp')
-rw-r--r--llvm/lib/Analysis/InlineCost.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp
index 7155c14..cebc873 100644
--- a/llvm/lib/Analysis/InlineCost.cpp
+++ b/llvm/lib/Analysis/InlineCost.cpp
@@ -1362,7 +1362,9 @@ static bool functionsHaveCompatibleAttributes(Function *Caller,
Function *Callee,
TargetTransformInfo &TTI) {
return TTI.areInlineCompatible(Caller, Callee) &&
- AttributeFuncs::areInlineCompatible(*Caller, *Callee);
+ attributeMatches(Caller, Callee, Attribute::SanitizeAddress) &&
+ attributeMatches(Caller, Callee, Attribute::SanitizeMemory) &&
+ attributeMatches(Caller, Callee, Attribute::SanitizeThread);
}
InlineCost InlineCostAnalysis::getInlineCost(CallSite CS, Function *Callee,