[11] RFR: Revert unnecessary additions to ciInstanceKlass and fieldDescriptor
Roman Kennke
rkennke at redhat.com
Tue Aug 20 20:06:19 UTC 2019
Good!
Thanks,
Roman
> This is not needed anymore after JDK-8229416 backport.
>
> Testing: hotspot_gc_shenandoah {fastdebug, release}, diffing with upstream 11u
>
> Fix:
>
> diff -r 4c1270c00f14 src/hotspot/share/ci/ciInstanceKlass.cpp
> --- a/src/hotspot/share/ci/ciInstanceKlass.cpp Tue Aug 13 14:59:29 2019 +0200
> +++ b/src/hotspot/share/ci/ciInstanceKlass.cpp Tue Aug 20 21:44:30 2019 +0200
> @@ -749,29 +749,5 @@
> // on their value for correct replay.
> StaticFinalFieldPrinter sffp(out, ik->name()->as_quoted_ascii());
> ik->do_local_static_fields(&sffp);
> }
> }
> -
> -#ifdef ASSERT
> -bool ciInstanceKlass::debug_final_field_at(int offset) {
> - GUARDED_VM_ENTRY(
> - InstanceKlass* ik = get_instanceKlass();
> - fieldDescriptor fd;
> - if (ik->find_field_from_offset(offset, false, &fd)) {
> - return fd.is_final();
> - }
> - );
> - return false;
> -}
> -
> -bool ciInstanceKlass::debug_stable_field_at(int offset) {
> - GUARDED_VM_ENTRY(
> - InstanceKlass* ik = get_instanceKlass();
> - fieldDescriptor fd;
> - if (ik->find_field_from_offset(offset, false, &fd)) {
> - return fd.is_stable();
> - }
> - );
> - return false;
> -}
> -#endif
> diff -r 4c1270c00f14 src/hotspot/share/ci/ciInstanceKlass.hpp
> --- a/src/hotspot/share/ci/ciInstanceKlass.hpp Tue Aug 13 14:59:29 2019 +0200
> +++ b/src/hotspot/share/ci/ciInstanceKlass.hpp Tue Aug 20 21:44:30 2019 +0200
> @@ -276,13 +276,8 @@
> return !is_interface() && !is_abstract();
> }
>
> // Dump the current state of this klass for compilation replay.
> virtual void dump_replay_data(outputStream* out);
> -
> -#ifdef ASSERT
> - bool debug_final_field_at(int offset);
> - bool debug_stable_field_at(int offset);
> -#endif
> };
>
> #endif // SHARE_VM_CI_CIINSTANCEKLASS_HPP
> diff -r 4c1270c00f14 src/hotspot/share/runtime/fieldDescriptor.hpp
> --- a/src/hotspot/share/runtime/fieldDescriptor.hpp Tue Aug 13 14:59:29 2019 +0200
> +++ b/src/hotspot/share/runtime/fieldDescriptor.hpp Tue Aug 20 21:44:30 2019 +0200
> @@ -98,11 +98,10 @@
> bool is_protected() const { return access_flags().is_protected(); }
> bool is_package_private() const { return !is_public() && !is_private() && !is_protected(); }
>
> bool is_static() const { return access_flags().is_static(); }
> bool is_final() const { return access_flags().is_final(); }
> - bool is_stable() const { return access_flags().is_stable(); }
> bool is_volatile() const { return access_flags().is_volatile(); }
> bool is_transient() const { return access_flags().is_transient(); }
>
> bool is_synthetic() const { return access_flags().is_synthetic(); }
>
>
More information about the shenandoah-dev
mailing list