Integrated: 8262046: Clean up parallel class loading code and comments
Coleen Phillimore
coleenp at openjdk.java.net
Thu Apr 1 21:20:28 UTC 2021
On Thu, 25 Mar 2021 17:23:42 GMT, Coleen Phillimore <coleenp at openjdk.org> wrote:
> This change reduces the length of SystemDictionary::resolve_instance_class_or_null, the main class loading function to 4 pages on my screen, down from ~6. Some functions are made static inside systemDictionary.hpp.
>
> The only executable change is that handle_parallel_super_load used to have a wait while the class's superclass was being loaded after calling resolve_super_or_fail. It was similar to the subsequent code that waited for the LOAD_INSTANCE placeholder, immediately following the return from handle_parallel_super_load. I consolidated this code to wait for both conditions and kept the comment from handle_parallel_super_load. This wait is now in the function handle_parallel_loading.
>
> I also added a new load_instance_class that calls load_instance_class_impl. The new load_instance_class does constraint checking and bookkeeping after it is called so that it can return with CHECK_NULL and not check pending exceptions. These functions aren't called outside of systemDictionary.cpp.
>
> I added a test to show why handle_parallel_super_load is needed (see bug for details of the deadlock that this test would get if not for handle_parallel_super_load).
>
> This updates comments to:
> 1. rewrote ClassCircularityError detection above resolve_super_or_fail so that it made more sense to me (hope it does for others too).
> 2. move comments to be near the code they describe
> 3. removed some comments that referred to code somewhere else but not helpful at that location, or to describe code that was deleted or obsolete, or repetitive
> 4. added a comment for resolve_instance_class_or_null
>
> Ran tier1-3 testing, jck vm, jck lang and our internal parallel class loading tests. Retesting with tiers 4-8 in progress (I tested an earlier version of this with no failures).
This pull request has now been integrated.
Changeset: 5e59d28d
Author: Coleen Phillimore <coleenp at openjdk.org>
URL: https://git.openjdk.java.net/jdk/commit/5e59d28d
Stats: 835 lines in 11 files changed: 608 ins; 115 del; 112 mod
8262046: Clean up parallel class loading code and comments
Reviewed-by: lfoltan, iklam
-------------
PR: https://git.openjdk.java.net/jdk/pull/3200
More information about the hotspot-runtime-dev
mailing list