1.1 --- a/src/share/vm/opto/compile.hpp Wed Mar 05 11:33:31 2008 -0800
1.2 +++ b/src/share/vm/opto/compile.hpp Thu Mar 06 10:30:17 2008 -0800
1.3 @@ -31,6 +31,7 @@
1.4 class Int_Array;
1.5 class Matcher;
1.6 class MachNode;
1.7 +class MachSafePointNode;
1.8 class Node;
1.9 class Node_Array;
1.10 class Node_Notes;
1.11 @@ -52,9 +53,6 @@
1.12 class Unique_Node_List;
1.13 class nmethod;
1.14 class WarmCallInfo;
1.15 -#ifdef ENABLE_ZAP_DEAD_LOCALS
1.16 -class MachSafePointNode;
1.17 -#endif
1.18
1.19 //------------------------------Compile----------------------------------------
1.20 // This class defines a top-level Compiler invocation.
1.21 @@ -127,6 +125,7 @@
1.22 const int _compile_id;
1.23 const bool _save_argument_registers; // save/restore arg regs for trampolines
1.24 const bool _subsume_loads; // Load can be matched as part of a larger op.
1.25 + const bool _do_escape_analysis; // Do escape analysis.
1.26 ciMethod* _method; // The method being compiled.
1.27 int _entry_bci; // entry bci for osr methods.
1.28 const TypeFunc* _tf; // My kind of signature
1.29 @@ -260,6 +259,8 @@
1.30 // instructions that subsume a load may result in an unschedulable
1.31 // instruction sequence.
1.32 bool subsume_loads() const { return _subsume_loads; }
1.33 + // Do escape analysis.
1.34 + bool do_escape_analysis() const { return _do_escape_analysis; }
1.35 bool save_argument_registers() const { return _save_argument_registers; }
1.36
1.37
1.38 @@ -560,7 +561,7 @@
1.39 // replacement, entry_bci indicates the bytecode for which to compile a
1.40 // continuation.
1.41 Compile(ciEnv* ci_env, C2Compiler* compiler, ciMethod* target,
1.42 - int entry_bci, bool subsume_loads);
1.43 + int entry_bci, bool subsume_loads, bool do_escape_analysis);
1.44
1.45 // Second major entry point. From the TypeFunc signature, generate code
1.46 // to pass arguments from the Java calling convention to the C calling
