comparison 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
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 /* 1 /*
2 * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
440 440
441 // Check if inlining policy says no. 441 // Check if inlining policy says no.
442 WarmCallInfo wci = *(initial_wci); 442 WarmCallInfo wci = *(initial_wci);
443 failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci); 443 failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci);
444 if (failure_msg != NULL && C->log() != NULL) { 444 if (failure_msg != NULL && C->log() != NULL) {
445 C->log()->begin_elem("inline_fail reason='"); 445 C->log()->inline_fail(failure_msg);
446 C->log()->text("%s", failure_msg);
447 C->log()->end_elem("'");
448 } 446 }
449 447
450 #ifndef PRODUCT 448 #ifndef PRODUCT
451 if (UseOldInlining && InlineWarmCalls 449 if (UseOldInlining && InlineWarmCalls
452 && (PrintOpto || PrintOptoInlining || PrintInlining)) { 450 && (PrintOpto || PrintOptoInlining || PrintInlining)) {