Mercurial > hg > truffle
diff src/share/vm/code/codeBlob.cpp @ 7226:8a3efb8c831d
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 14 Dec 2012 13:02:49 +0100 |
parents | 5d0bb7d52783 |
children | b8f261ba79c6 |
line wrap: on
line diff
--- a/src/share/vm/code/codeBlob.cpp Fri Dec 14 12:05:35 2012 +0100 +++ b/src/share/vm/code/codeBlob.cpp Fri Dec 14 13:02:49 2012 +0100 @@ -384,9 +384,7 @@ _unpack_offset = unpack_offset; _unpack_with_exception = unpack_with_exception_offset; _unpack_with_reexecution = unpack_with_reexecution_offset; -#if defined(COMPILER1) || defined(GRAAL) _unpack_with_exception_in_tls = -1; -#endif }