diff options
author | Larisse Voufo <lvoufo@google.com> | 2015-02-14 05:42:57 +0000 |
---|---|---|
committer | Larisse Voufo <lvoufo@google.com> | 2015-02-14 05:42:57 +0000 |
commit | 5526f4f094294a7f5c63f80c0fb096ee9dbc3867 (patch) | |
tree | 3399db24241cebd9a8e07418b1c1a4daa3c851f7 /clang/lib/CodeGen/CodeGenFunction.cpp | |
parent | 0414b8578e8a967de9d7c5a9916816802e1d2c3b (diff) | |
download | bcm5719-llvm-5526f4f094294a7f5c63f80c0fb096ee9dbc3867.tar.gz bcm5719-llvm-5526f4f094294a7f5c63f80c0fb096ee9dbc3867.zip |
Revise the implementation logic of sized deallocation: Do not automatically generate weak definitions of the sized operator delete (in terms of unsized operator delete). Instead, provide the funcitonality via a new compiler flag, -fdef-sized-delete.
The current implementation causes link-time ODR violations when the delete symbols are exported into the dynamic table.
llvm-svn: 229241
Diffstat (limited to 'clang/lib/CodeGen/CodeGenFunction.cpp')
-rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 79425d4c21e..4d03bdb8ef4 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -891,8 +891,11 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, } else if (FunctionDecl *UnsizedDealloc = FD->getCorrespondingUnsizedGlobalDeallocationFunction()) { // Global sized deallocation functions get an implicit weak definition if - // they don't have an explicit definition. + // they don't have an explicit definition, if allowed. + assert(getLangOpts().DefaultSizedDelete && + "Can't emit unallowed definition."); EmitSizedDeallocationFunction(*this, UnsizedDealloc); + } else llvm_unreachable("no definition for emitted function"); |