1.1 --- a/src/share/vm/c1/c1_GraphBuilder.hpp Thu Sep 02 11:40:02 2010 -0700 1.2 +++ b/src/share/vm/c1/c1_GraphBuilder.hpp Fri Sep 03 17:51:07 2010 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -342,27 +342,17 @@ 1.11 1.12 NOT_PRODUCT(void print_inline_result(ciMethod* callee, bool res);) 1.13 1.14 - // methodDataOop profiling helpers 1.15 void profile_call(Value recv, ciKlass* predicted_holder); 1.16 - void profile_invocation(ciMethod* method); 1.17 - void profile_bci(int bci); 1.18 + void profile_invocation(ciMethod* inlinee, ValueStack* state, int bci); 1.19 1.20 - // Helpers for generation of profile information 1.21 - bool profile_branches() { 1.22 - return _compilation->env()->comp_level() == CompLevel_fast_compile && 1.23 - Tier1UpdateMethodData && Tier1ProfileBranches; 1.24 - } 1.25 - bool profile_calls() { 1.26 - return _compilation->env()->comp_level() == CompLevel_fast_compile && 1.27 - Tier1UpdateMethodData && Tier1ProfileCalls; 1.28 - } 1.29 - bool profile_inlined_calls() { 1.30 - return profile_calls() && Tier1ProfileInlinedCalls; 1.31 - } 1.32 - bool profile_checkcasts() { 1.33 - return _compilation->env()->comp_level() == CompLevel_fast_compile && 1.34 - Tier1UpdateMethodData && Tier1ProfileCheckcasts; 1.35 - } 1.36 + // Shortcuts to profiling control. 1.37 + bool is_profiling() { return _compilation->is_profiling(); } 1.38 + bool count_invocations() { return _compilation->count_invocations(); } 1.39 + bool count_backedges() { return _compilation->count_backedges(); } 1.40 + bool profile_branches() { return _compilation->profile_branches(); } 1.41 + bool profile_calls() { return _compilation->profile_calls(); } 1.42 + bool profile_inlined_calls() { return _compilation->profile_inlined_calls(); } 1.43 + bool profile_checkcasts() { return _compilation->profile_checkcasts(); } 1.44 1.45 public: 1.46 NOT_PRODUCT(void print_stats();)