Mercurial > hg > truffle
diff src/share/vm/c1/c1_GraphBuilder.hpp @ 4875:379b22e03c32
Merge
author | jcoomes |
---|---|
date | Fri, 03 Feb 2012 12:08:55 -0800 |
parents | f067b4e0e04b |
children | 1d7922586cf6 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.hpp Fri Feb 03 14:04:59 2012 -0500 +++ b/src/share/vm/c1/c1_GraphBuilder.hpp Fri Feb 03 12:08:55 2012 -0800 @@ -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