Mercurial > hg > truffle
diff src/share/vm/asm/codeBuffer.hpp @ 1689:f4f596978298
Merge
author | never |
---|---|
date | Mon, 09 Aug 2010 17:51:56 -0700 |
parents | 126ea7725993 0e35fa8ebccd |
children | 3e8fbc61cee8 |
line wrap: on
line diff
--- a/src/share/vm/asm/codeBuffer.hpp Tue Aug 03 08:13:38 2010 -0400 +++ b/src/share/vm/asm/codeBuffer.hpp Mon Aug 09 17:51:56 2010 -0700 @@ -278,7 +278,7 @@ // special case during expansion which is handled internally. This // is done to guarantee proper cleanup of resources. void* operator new(size_t size) { return ResourceObj::operator new(size); } - void operator delete(void* p) { ResourceObj::operator delete(p); } + void operator delete(void* p) { ShouldNotCallThis(); } public: typedef int csize_t; // code size type; would be size_t except for history