Mercurial > hg > graal-jvmci-8
diff src/share/vm/asm/codeBuffer.cpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | 2d26b0046e0d 79d8657be916 |
children | e88293edf07c |
line wrap: on
line diff
--- a/src/share/vm/asm/codeBuffer.cpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/asm/codeBuffer.cpp Fri Jan 07 18:18:08 2011 +0100 @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_codeBuffer.cpp.incl" +#include "precompiled.hpp" +#include "asm/codeBuffer.hpp" +#include "compiler/disassembler.hpp" +#include "utilities/copy.hpp" // The structure of a CodeSection: // @@ -129,6 +131,7 @@ #ifdef ASSERT // Save allocation type to execute assert in ~ResourceObj() // which is called after this destructor. + assert(_default_oop_recorder.allocated_on_stack(), "should be embedded object"); ResourceObj::allocation_type at = _default_oop_recorder.get_allocation_type(); Copy::fill_to_bytes(this, sizeof(*this), badResourceValue); ResourceObj::set_allocation_type((address)(&_default_oop_recorder), at);