Mercurial > hg > truffle
changeset 8886:f69a72df4939
Fix merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sun, 07 Apr 2013 14:53:18 +0200 |
parents | 4877c7dfe6d6 |
children | 34d13df4165b |
files | src/share/vm/c1/c1_Runtime1.cpp |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.cpp Sun Apr 07 13:26:16 2013 +0200 +++ b/src/share/vm/c1/c1_Runtime1.cpp Sun Apr 07 14:53:18 2013 +0200 @@ -1371,7 +1371,7 @@ } - Deoptimization::deoptimize_frame(thread, caller_frame.id()); + Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_none); JRT_END