Mercurial > hg > truffle
diff src/share/vm/c1/c1_GraphBuilder.hpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | f067b4e0e04b |
children | 1d7922586cf6 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.hpp Fri Feb 24 18:30:42 2012 -0800 +++ b/src/share/vm/c1/c1_GraphBuilder.hpp Mon Feb 27 13:10:13 2012 +0100 @@ -337,9 +337,9 @@ void fill_sync_handler(Value lock, BlockBegin* sync_handler, bool default_handler = false); // inliners - bool try_inline( ciMethod* callee, bool holder_known); + bool try_inline( ciMethod* callee, bool holder_known, Value receiver = NULL); bool try_inline_intrinsics(ciMethod* callee); - bool try_inline_full( ciMethod* callee, bool holder_known, BlockBegin* cont_block = NULL); + bool try_inline_full( ciMethod* callee, bool holder_known, BlockBegin* cont_block, Value receiver); bool try_inline_jsr(int jsr_dest_bci); // JSR 292 support