maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "CFI: blacklist STL allocate() from unrelated-casts" 

This reverts commit r310097.

llvm-svn: 310099
This commit is contained in:
Vlad Tsyrklevich 2017-08-04 19:17:16 +00:00
parent 2c7eee5b84
commit 3fed079f8c
2 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clang/lib/CodeGen/CodeGenFunction.cpp
View File

@ -723,25 +723,6 @@ static void markAsIgnoreThreadCheckingAtRuntime(llvm::Function *Fn) {
Fn->removeFnAttr(llvm::Attribute::SanitizeThread); Fn->removeFnAttr(llvm::Attribute::SanitizeThread);
} }
static bool matchesStlAllocatorFn(const Decl *D, const ASTContext &Ctx) {
auto *MD = dyn_cast_or_null<CXXMethodDecl>(D);
if (!MD || !MD->getName().equals("allocate") ||
(MD->getNumParams() != 1 && MD->getNumParams() != 2))
return false;
if (MD->parameters()[0]->getType().getCanonicalType() != Ctx.getSizeType())
return false;
if (MD->getNumParams() == 2) {
auto *PT = MD->parameters()[1]->getType()->getAs<PointerType>();
if (!PT || !PT->isVoidPointerType() ||
!PT->getPointeeType().isConstQualified())
return false;
}
return true;
}
void CodeGenFunction::StartFunction(GlobalDecl GD, void CodeGenFunction::StartFunction(GlobalDecl GD,
QualType RetTy, QualType RetTy,
llvm::Function *Fn, llvm::Function *Fn,
@ -801,14 +782,6 @@ void CodeGenFunction::StartFunction(GlobalDecl GD,
} }
} }
// Ignore unrelated casts in STL allocate() since the allocator must cast
// from void* to T* before object initialization completes. Don't match on the
// namespace because not all allocators are in std::
if (D && SanOpts.has(SanitizerKind::CFIUnrelatedCast)) {
if (matchesStlAllocatorFn(D, getContext()))
SanOpts.Mask &= ~SanitizerKind::CFIUnrelatedCast;
}
// Apply xray attributes to the function (as a string, for now) // Apply xray attributes to the function (as a string, for now)
if (D && ShouldXRayInstrumentFunction()) { if (D && ShouldXRayInstrumentFunction()) {
if (const auto *XRayAttr = D->getAttr<XRayInstrumentAttr>()) { if (const auto *XRayAttr = D->getAttr<XRayInstrumentAttr>()) {

37
clang/test/CodeGen/cfi-unrelated-cast.cpp
View File

@ -1,37 +0,0 @@
// STL allocators should not have unrelated-cast tests applied
// RUN: %clang_cc1 -flto -fvisibility hidden -fsanitize=cfi-unrelated-cast -emit-llvm -o - %s | FileCheck %s
#include <stddef.h>
template<class T>
class myalloc {
public:
// CHECK: define{{.*}}allocateE{{.}}
// CHECK-NOT: llvm.type.test
T *allocate(size_t sz) {
return (T*)::operator new(sz);
}
// CHECK: define{{.*}}allocateE{{.}}PKv
// CHECK-NOT: llvm.type.test
T *allocate(size_t sz, const void *ptr) {
return (T*)::operator new(sz);
}
// CHECK: define{{.*}}differentName
// CHECK: llvm.type.test
T *differentName(size_t sz, const void *ptr) {
return (T*)::operator new(sz);
}
};
class C1 {
virtual void f() {}
};
C1 *f1() {
myalloc<C1> allocator;
(void)allocator.allocate(16);
(void)allocator.allocate(16, 0);
(void)allocator.differentName(16, 0);
}