Mercurial > hg > truffle
diff src/share/vm/opto/bytecodeInfo.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | 957c266d8bc5 d804e148cff8 |
| children | 2cb439954abf |
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/opto/bytecodeInfo.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -442,9 +442,7 @@ WarmCallInfo wci = *(initial_wci); failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci); if (failure_msg != NULL && C->log() != NULL) { - C->log()->begin_elem("inline_fail reason='"); - C->log()->text("%s", failure_msg); - C->log()->end_elem("'"); + C->log()->inline_fail(failure_msg); } #ifndef PRODUCT