From 354362524a72b3fa43a6c09380b7ae3b2380cbba Mon Sep 17 00:00:00 2001 From: Juergen Ributzka Date: Tue, 19 Nov 2013 00:57:56 +0000 Subject: [weak vtables] Remove a bunch of weak vtables This patch removes most of the trivial cases of weak vtables by pinning them to a single object file. The memory leaks in this version have been fixed. Thanks Alexey for pointing them out. Differential Revision: http://llvm-reviews.chandlerc.com/D2068 Reviewed by Andy git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195064 91177308-0d34-0410-b5e6-96231b3b80d8 --- examples/ExceptionDemo/ExceptionDemo.cpp | 4 +++- examples/Kaleidoscope/Chapter2/toy.cpp | 13 ++++++++++++- examples/Kaleidoscope/Chapter3/toy.cpp | 5 ++++- examples/Kaleidoscope/Chapter4/toy.cpp | 5 ++++- examples/Kaleidoscope/Chapter5/toy.cpp | 5 ++++- examples/Kaleidoscope/Chapter6/toy.cpp | 5 ++++- examples/Kaleidoscope/Chapter7/toy.cpp | 5 ++++- 7 files changed, 35 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/ExceptionDemo/ExceptionDemo.cpp b/examples/ExceptionDemo/ExceptionDemo.cpp index 61b175091b..6a0d0d027f 100644 --- a/examples/ExceptionDemo/ExceptionDemo.cpp +++ b/examples/ExceptionDemo/ExceptionDemo.cpp @@ -1577,9 +1577,11 @@ public: std::runtime_error::operator=(toCopy))); } - ~OurCppRunException (void) throw () {} + ~OurCppRunException (void) throw (); }; +// Provide out-of-line definition to prevent weak vtable. +OurCppRunException::~OurCppRunException() throw () {} /// Throws foreign C++ exception. /// @param ignoreIt unused parameter that allows function to match implied diff --git a/examples/Kaleidoscope/Chapter2/toy.cpp b/examples/Kaleidoscope/Chapter2/toy.cpp index 2dc6711eed..99ec90e9b0 100644 --- a/examples/Kaleidoscope/Chapter2/toy.cpp +++ b/examples/Kaleidoscope/Chapter2/toy.cpp @@ -79,13 +79,14 @@ static int gettok() { /// ExprAST - Base class for all expression nodes. class ExprAST { public: - virtual ~ExprAST() {} + virtual ~ExprAST(); }; /// NumberExprAST - Expression class for numeric literals like "1.0". class NumberExprAST : public ExprAST { public: NumberExprAST(double val) {} + virtual ~NumberExprAST(); }; /// VariableExprAST - Expression class for referencing a variable, like "a". @@ -93,12 +94,14 @@ class VariableExprAST : public ExprAST { std::string Name; public: VariableExprAST(const std::string &name) : Name(name) {} + virtual ~VariableExprAST(); }; /// BinaryExprAST - Expression class for a binary operator. class BinaryExprAST : public ExprAST { public: BinaryExprAST(char op, ExprAST *lhs, ExprAST *rhs) {} + virtual ~BinaryExprAST(); }; /// CallExprAST - Expression class for function calls. @@ -108,8 +111,16 @@ class CallExprAST : public ExprAST { public: CallExprAST(const std::string &callee, std::vector &args) : Callee(callee), Args(args) {} + virtual ~CallExprAST(); }; +// Provide out-of-line definitions to prevent weak vtables. +ExprAST::~ExprAST() {} +NumberExprAST::~NumberExprAST() {} +VariableExprAST::~VariableExprAST() {} +BinaryExprAST::~BinaryExprAST() {} +CallExprAST::~CallExprAST() {} + /// PrototypeAST - This class represents the "prototype" for a function, /// which captures its name, and its argument names (thus implicitly the number /// of arguments the function takes). diff --git a/examples/Kaleidoscope/Chapter3/toy.cpp b/examples/Kaleidoscope/Chapter3/toy.cpp index 0fb64e3a54..2494345c3f 100644 --- a/examples/Kaleidoscope/Chapter3/toy.cpp +++ b/examples/Kaleidoscope/Chapter3/toy.cpp @@ -84,10 +84,13 @@ static int gettok() { /// ExprAST - Base class for all expression nodes. class ExprAST { public: - virtual ~ExprAST() {} + virtual ~ExprAST(); virtual Value *Codegen() = 0; }; +// Provide out-of-line definition to prevent weak vtable. +ExprAST::~ExprAST() {} + /// NumberExprAST - Expression class for numeric literals like "1.0". class NumberExprAST : public ExprAST { double Val; diff --git a/examples/Kaleidoscope/Chapter4/toy.cpp b/examples/Kaleidoscope/Chapter4/toy.cpp index 0e41cc14ea..4d56c0f2df 100644 --- a/examples/Kaleidoscope/Chapter4/toy.cpp +++ b/examples/Kaleidoscope/Chapter4/toy.cpp @@ -91,10 +91,13 @@ static int gettok() { /// ExprAST - Base class for all expression nodes. class ExprAST { public: - virtual ~ExprAST() {} + virtual ~ExprAST(); virtual Value *Codegen() = 0; }; +// Provide out-of-line definition to prevent weak vtable. +ExprAST::~ExprAST() {} + /// NumberExprAST - Expression class for numeric literals like "1.0". class NumberExprAST : public ExprAST { double Val; diff --git a/examples/Kaleidoscope/Chapter5/toy.cpp b/examples/Kaleidoscope/Chapter5/toy.cpp index d5a88a5a69..113016a326 100644 --- a/examples/Kaleidoscope/Chapter5/toy.cpp +++ b/examples/Kaleidoscope/Chapter5/toy.cpp @@ -100,10 +100,13 @@ static int gettok() { /// ExprAST - Base class for all expression nodes. class ExprAST { public: - virtual ~ExprAST() {} + virtual ~ExprAST(); virtual Value *Codegen() = 0; }; +// Provide out-of-line definition to prevent weak vtable. +ExprAST::~ExprAST() {} + /// NumberExprAST - Expression class for numeric literals like "1.0". class NumberExprAST : public ExprAST { double Val; diff --git a/examples/Kaleidoscope/Chapter6/toy.cpp b/examples/Kaleidoscope/Chapter6/toy.cpp index 4d6a128cba..70f233bf48 100644 --- a/examples/Kaleidoscope/Chapter6/toy.cpp +++ b/examples/Kaleidoscope/Chapter6/toy.cpp @@ -105,10 +105,13 @@ static int gettok() { /// ExprAST - Base class for all expression nodes. class ExprAST { public: - virtual ~ExprAST() {} + virtual ~ExprAST(); virtual Value *Codegen() = 0; }; +// Provide out-of-line definition to prevent weak vtable. +ExprAST::~ExprAST() {} + /// NumberExprAST - Expression class for numeric literals like "1.0". class NumberExprAST : public ExprAST { double Val; diff --git a/examples/Kaleidoscope/Chapter7/toy.cpp b/examples/Kaleidoscope/Chapter7/toy.cpp index beb0c0099c..a05d134a1a 100644 --- a/examples/Kaleidoscope/Chapter7/toy.cpp +++ b/examples/Kaleidoscope/Chapter7/toy.cpp @@ -109,10 +109,13 @@ static int gettok() { /// ExprAST - Base class for all expression nodes. class ExprAST { public: - virtual ~ExprAST() {} + virtual ~ExprAST(); virtual Value *Codegen() = 0; }; +// Provide out-of-line definition to prevent weak vtable. +ExprAST::~ExprAST() {} + /// NumberExprAST - Expression class for numeric literals like "1.0". class NumberExprAST : public ExprAST { double Val; -- cgit v1.2.3