mirror of
https://github.com/capstone-engine/llvm-capstone.git
synced 2025-02-26 05:18:46 +00:00
Allow system header to provide their own implementation of some builtin
If a system header provides an (inline) implementation of some of their function, clang still matches on the function name and generate the appropriate llvm builtin, e.g. memcpy. This behavior is in line with glibc recommendation « users may not provide their own version of symbols » but doesn't account for the fact that glibc itself can provide inline version of some functions. It is the case for the memcpy function when -D_FORTIFY_SOURCE=1 is on. In that case an inline version of memcpy calls __memcpy_chk, a function that performs extra runtime checks. Clang currently ignores the inline version and thus provides no runtime check. This code fixes the issue by detecting functions whose name is a builtin name but also have an inline implementation. Differential Revision: https://reviews.llvm.org/D71082
This commit is contained in:
parent
164da67300
commit
921f871ac4
@ -2309,6 +2309,9 @@ public:
|
||||
/// true through IsAligned.
|
||||
bool isReplaceableGlobalAllocationFunction(bool *IsAligned = nullptr) const;
|
||||
|
||||
/// Determine if this function provides an inline implementation of a builtin.
|
||||
bool isInlineBuiltinDeclaration() const;
|
||||
|
||||
/// Determine whether this is a destroying operator delete.
|
||||
bool isDestroyingOperatorDelete() const;
|
||||
|
||||
|
@ -3046,6 +3046,14 @@ bool FunctionDecl::isReplaceableGlobalAllocationFunction(bool *IsAligned) const
|
||||
return Params == FPT->getNumParams();
|
||||
}
|
||||
|
||||
bool FunctionDecl::isInlineBuiltinDeclaration() const {
|
||||
if (!getBuiltinID())
|
||||
return false;
|
||||
|
||||
const FunctionDecl *Definition;
|
||||
return hasBody(Definition) && Definition->isInlineSpecified();
|
||||
}
|
||||
|
||||
bool FunctionDecl::isDestroyingOperatorDelete() const {
|
||||
// C++ P0722:
|
||||
// Within a class C, a single object deallocation function with signature
|
||||
|
@ -4622,8 +4622,15 @@ RValue CodeGenFunction::EmitSimpleCallExpr(const CallExpr *E,
|
||||
}
|
||||
|
||||
static CGCallee EmitDirectCallee(CodeGenFunction &CGF, const FunctionDecl *FD) {
|
||||
|
||||
if (auto builtinID = FD->getBuiltinID()) {
|
||||
return CGCallee::forBuiltin(builtinID, FD);
|
||||
// Replaceable builtin provide their own implementation of a builtin. Unless
|
||||
// we are in the builtin implementation itself, don't call the actual
|
||||
// builtin. If we are in the builtin implementation, avoid trivial infinite
|
||||
// recursion.
|
||||
if (!FD->isInlineBuiltinDeclaration() ||
|
||||
CGF.CurFn->getName() == FD->getName())
|
||||
return CGCallee::forBuiltin(builtinID, FD);
|
||||
}
|
||||
|
||||
llvm::Constant *calleePtr = EmitFunctionDeclPointer(CGF.CGM, FD);
|
||||
|
@ -1840,6 +1840,11 @@ void CodeGenModule::SetFunctionAttributes(GlobalDecl GD, llvm::Function *F,
|
||||
else if (const auto *SA = FD->getAttr<SectionAttr>())
|
||||
F->setSection(SA->getName());
|
||||
|
||||
if (FD->isInlineBuiltinDeclaration()) {
|
||||
F->addAttribute(llvm::AttributeList::FunctionIndex,
|
||||
llvm::Attribute::NoBuiltin);
|
||||
}
|
||||
|
||||
if (FD->isReplaceableGlobalAllocationFunction()) {
|
||||
// A replaceable global allocation function does not act like a builtin by
|
||||
// default, only if it is invoked by a new-expression or delete-expression.
|
||||
|
15
clang/test/CodeGen/memcpy-nobuiltin.c
Normal file
15
clang/test/CodeGen/memcpy-nobuiltin.c
Normal file
@ -0,0 +1,15 @@
|
||||
// RUN: %clang_cc1 -verify -S -emit-llvm -o- %s -isystem %S -DWITH_DECL | FileCheck --check-prefix=CHECK-WITH-DECL %s
|
||||
// RUN: %clang_cc1 -verify -S -emit-llvm -o- %s -isystem %S -UWITH_DECL | FileCheck --check-prefix=CHECK-NO-DECL %s
|
||||
// RUN: %clang_cc1 -verify -S -emit-llvm -o- %s -isystem %S -DWITH_SELF_REFERENCE_DECL | FileCheck --check-prefix=CHECK-SELF-REF-DECL %s
|
||||
//
|
||||
// CHECK-WITH-DECL-NOT: @llvm.memcpy
|
||||
// CHECK-NO-DECL: @llvm.memcpy
|
||||
// CHECK-SELF-REF-DECL: @llvm.memcpy
|
||||
//
|
||||
#include <memcpy-nobuiltin.inc>
|
||||
void test(void *dest, void const *from, size_t n) {
|
||||
memcpy(dest, from, n);
|
||||
|
||||
static char buffer[1];
|
||||
memcpy(buffer, from, 2); // expected-warning {{'memcpy' will always overflow; destination buffer has size 1, but size argument is 2}}
|
||||
}
|
19
clang/test/CodeGen/memcpy-nobuiltin.inc
Normal file
19
clang/test/CodeGen/memcpy-nobuiltin.inc
Normal file
@ -0,0 +1,19 @@
|
||||
#include <stddef.h>
|
||||
extern void *memcpy(void *dest, void const *from, size_t n);
|
||||
|
||||
#ifdef WITH_DECL
|
||||
inline void *memcpy(void *dest, void const *from, size_t n) {
|
||||
char const *ifrom = from;
|
||||
char *idest = dest;
|
||||
while (n--)
|
||||
*idest++ = *ifrom++;
|
||||
return dest;
|
||||
}
|
||||
#endif
|
||||
#ifdef WITH_SELF_REFERENCE_DECL
|
||||
inline void *memcpy(void *dest, void const *from, size_t n) {
|
||||
if (n != 0)
|
||||
memcpy(dest, from, n);
|
||||
return dest;
|
||||
}
|
||||
#endif
|
Loading…
x
Reference in New Issue
Block a user