Mercurial > hg > truffle
changeset 1173:73b22f919c34
6912065: final fields in objects need to support inlining optimizations for JSR 292
Reviewed-by: twisti, kvn
author | jrose |
---|---|
date | Wed, 13 Jan 2010 23:05:52 -0800 |
parents | b2b6a9bf6238 |
children | ddb7834449d0 |
files | src/share/vm/ci/ciField.cpp src/share/vm/runtime/globals.hpp |
diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/ci/ciField.cpp Tue Jan 12 14:37:35 2010 -0800 +++ b/src/share/vm/ci/ciField.cpp Wed Jan 13 23:05:52 2010 -0800 @@ -161,6 +161,18 @@ "bootstrap classes must not create & cache unshared fields"); } +static bool trust_final_non_static_fields(ciInstanceKlass* holder) { + if (holder == NULL) + return false; + if (holder->name() == ciSymbol::java_lang_System()) + // Never trust strangely unstable finals: System.out, etc. + return false; + // Even if general trusting is disabled, trust system-built closures in these packages. + if (holder->is_in_package("java/dyn") || holder->is_in_package("sun/dyn")) + return true; + return TrustFinalNonStaticFields; +} + void ciField::initialize_from(fieldDescriptor* fd) { // Get the flags, offset, and canonical holder of the field. _flags = ciFlags(fd->access_flags()); @@ -172,7 +184,7 @@ if (!this->is_static()) { // A field can be constant if it's a final static field or if it's // a final non-static field of a trusted class ({java,sun}.dyn). - if (_holder->is_in_package("java/dyn") || _holder->is_in_package("sun/dyn")) { + if (trust_final_non_static_fields(_holder)) { _is_constant = true; return; }
--- a/src/share/vm/runtime/globals.hpp Tue Jan 12 14:37:35 2010 -0800 +++ b/src/share/vm/runtime/globals.hpp Wed Jan 13 23:05:52 2010 -0800 @@ -3370,6 +3370,9 @@ diagnostic(bool, OptimizeMethodHandles, true, \ "when constructing method handles, try to improve them") \ \ + experimental(bool, TrustFinalNonStaticFields, false, \ + "trust final non-static declarations for constant folding") \ + \ experimental(bool, EnableInvokeDynamic, false, \ "recognize the invokedynamic instruction") \ \