Mercurial > hg > graal-compiler
diff src/share/vm/runtime/vframeArray.cpp @ 7226:8a3efb8c831d
Merge.
| author | Christian Haeubl <haeubl@ssw.jku.at> |
|---|---|
| date | Fri, 14 Dec 2012 13:02:49 +0100 |
| parents | ceb8c5b29419 5d0bb7d52783 |
| children | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/src/share/vm/runtime/vframeArray.cpp Fri Dec 14 12:05:35 2012 +0100 +++ b/src/share/vm/runtime/vframeArray.cpp Fri Dec 14 13:02:49 2012 +0100 @@ -252,7 +252,7 @@ case Deoptimization::Unpack_uncommon_trap: case Deoptimization::Unpack_reexecute: // redo last byte code -#ifdef GRAAL +#ifdef GRAALVM assert(should_reexecute(), ""); #endif pc = Interpreter::deopt_entry(vtos, 0);