I think this broke self hosting. I think its related to templates somehow, but not sure beyond that.<br><br>llvm/include/llvm/Operator.h:231:7: error: non-deleted function '~GEPOperator' cannot override a deleted function<br>
class GEPOperator<br> ^<br>llvm/include/llvm/Operator.h:188:7: note: overridden virtual function is here<br>class ConcreteOperator : public SuperClass {<br><br><div class="gmail_quote">On Tue, Oct 23, 2012 at 5:30 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard-llvm@metafoo.co.uk" target="_blank">richard-llvm@metafoo.co.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Tue Oct 23 19:30:41 2012<br>
New Revision: 166530<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=166530&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=166530&view=rev</a><br>
Log:<br>
Fix ODR violations: a virtual function must be defined, even if it's never<br>
called. Provide an (asserting) definition of Operator's private destructor.<br>
Remove destructors from all classes derived from Operator. We don't need them<br>
for safety, because their implicit definitions would be ill-formed (they'd call<br>
Operator's private destructor), and we don't need them to avoid emitting<br>
vtables, because we don't do anything with Operator subclasses which would<br>
trigger vtable instantiation.<br>
<br>
The Operator hierarchy is still a complete disaster with regard to undefined<br>
behavior, but this at least allows LLVM to link when using Clang's<br>
-fcatch-undefined-behavior with a new vptr-based type checking mechanism.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/Operator.h<br>
llvm/trunk/lib/VMCore/User.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/Operator.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Operator.h?rev=166530&r1=166529&r2=166530&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Operator.h?rev=166530&r1=166529&r2=166530&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Operator.h (original)<br>
+++ llvm/trunk/include/llvm/Operator.h Tue Oct 23 19:30:41 2012<br>
@@ -36,8 +36,10 @@<br>
void *operator new(size_t, unsigned) LLVM_DELETED_FUNCTION;<br>
void *operator new(size_t s) LLVM_DELETED_FUNCTION;<br>
Operator() LLVM_DELETED_FUNCTION;<br>
- // NOTE: cannot use LLVM_DELETED_FUNCTION because it's not legal to delete<br>
- // an overridden method that's not deleted in the base class.<br>
+<br>
+ // NOTE: Cannot use LLVM_DELETED_FUNCTION because it's not legal to delete<br>
+ // an overridden method that's not deleted in the base class. Cannot leave<br>
+ // this unimplemented because that leads to an ODR-violation.<br>
~Operator();<br>
<br>
public:<br>
@@ -79,8 +81,6 @@<br>
};<br>
<br>
private:<br>
- ~OverflowingBinaryOperator(); // DO NOT IMPLEMENT<br>
-<br>
friend class BinaryOperator;<br>
friend class ConstantExpr;<br>
void setHasNoUnsignedWrap(bool B) {<br>
@@ -132,8 +132,6 @@<br>
};<br>
<br>
private:<br>
- ~PossiblyExactOperator(); // DO NOT IMPLEMENT<br>
-<br>
friend class BinaryOperator;<br>
friend class ConstantExpr;<br>
void setIsExact(bool B) {<br>
@@ -168,9 +166,6 @@<br>
/// FPMathOperator - Utility class for floating point operations which can have<br>
/// information about relaxed accuracy requirements attached to them.<br>
class FPMathOperator : public Operator {<br>
-private:<br>
- ~FPMathOperator(); // DO NOT IMPLEMENT<br>
-<br>
public:<br>
<br>
/// \brief Get the maximum error permitted by this operation in ULPs. An<br>
@@ -191,7 +186,6 @@<br>
/// opcodes.<br>
template<typename SuperClass, unsigned Opc><br>
class ConcreteOperator : public SuperClass {<br>
- ~ConcreteOperator(); // DO NOT IMPLEMENT<br>
public:<br>
static inline bool classof(const Instruction *I) {<br>
return I->getOpcode() == Opc;<br>
@@ -207,45 +201,35 @@<br>
<br>
class AddOperator<br>
: public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {<br>
- ~AddOperator(); // DO NOT IMPLEMENT<br>
};<br>
class SubOperator<br>
: public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {<br>
- ~SubOperator(); // DO NOT IMPLEMENT<br>
};<br>
class MulOperator<br>
: public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {<br>
- ~MulOperator(); // DO NOT IMPLEMENT<br>
};<br>
class ShlOperator<br>
: public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {<br>
- ~ShlOperator(); // DO NOT IMPLEMENT<br>
};<br>
<br>
<br>
class SDivOperator<br>
: public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {<br>
- ~SDivOperator(); // DO NOT IMPLEMENT<br>
};<br>
class UDivOperator<br>
: public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {<br>
- ~UDivOperator(); // DO NOT IMPLEMENT<br>
};<br>
class AShrOperator<br>
: public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {<br>
- ~AShrOperator(); // DO NOT IMPLEMENT<br>
};<br>
class LShrOperator<br>
: public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {<br>
- ~LShrOperator(); // DO NOT IMPLEMENT<br>
};<br>
<br>
<br>
<br>
class GEPOperator<br>
: public ConcreteOperator<Operator, Instruction::GetElementPtr> {<br>
- ~GEPOperator(); // DO NOT IMPLEMENT<br>
-<br>
enum {<br>
IsInBounds = (1 << 0)<br>
};<br>
<br>
Modified: llvm/trunk/lib/VMCore/User.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/User.cpp?rev=166530&r1=166529&r2=166530&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/User.cpp?rev=166530&r1=166529&r2=166530&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/VMCore/User.cpp (original)<br>
+++ llvm/trunk/lib/VMCore/User.cpp Tue Oct 23 19:30:41 2012<br>
@@ -10,6 +10,7 @@<br>
#include "llvm/Constant.h"<br>
#include "llvm/GlobalValue.h"<br>
#include "llvm/User.h"<br>
+#include "llvm/Operator.h"<br>
<br>
namespace llvm {<br>
<br>
@@ -78,4 +79,12 @@<br>
::operator delete(Storage);<br>
}<br>
<br>
+//===----------------------------------------------------------------------===//<br>
+// Operator Class<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+Operator::~Operator() {<br>
+ llvm_unreachable("should never destroy an Operator");<br>
+}<br>
+<br>
} // End llvm namespace<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>~Craig<br>