mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-22 03:54:33 +02:00
7009266: G1: assert(obj->is_oop_or_null(true )) failed: Error
A referent object that is only weakly reachable at the start of concurrent marking but is re-attached to the strongly reachable object graph during marking may not be marked as live. This can cause the reference object to be processed prematurely and leave dangling pointers to the referent object. Implement a read barrier for the java.lang.ref.Reference::referent field by intrinsifying the Reference.get() method, and intercepting accesses though JNI, reflection, and Unsafe, so that when a non-null referent object is read it is also logged in an SATB buffer. Reviewed-by: kvn, iveresov, never, tonyp, dholmes
This commit is contained in:
parent
aac4647e6e
commit
a08e1ce906
41 changed files with 1423 additions and 268 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -544,8 +544,10 @@ class GraphKit : public Phase {
|
|||
BasicType bt);
|
||||
|
||||
// For the few case where the barriers need special help
|
||||
void pre_barrier(Node* ctl, Node* obj, Node* adr, uint adr_idx,
|
||||
Node* val, const TypeOopPtr* val_type, BasicType bt);
|
||||
void pre_barrier(bool do_load, Node* ctl,
|
||||
Node* obj, Node* adr, uint adr_idx, Node* val, const TypeOopPtr* val_type,
|
||||
Node* pre_val,
|
||||
BasicType bt);
|
||||
|
||||
void post_barrier(Node* ctl, Node* store, Node* obj, Node* adr, uint adr_idx,
|
||||
Node* val, BasicType bt, bool use_precise);
|
||||
|
@ -669,11 +671,13 @@ class GraphKit : public Phase {
|
|||
Node* adr, uint adr_idx, Node* val, bool use_precise);
|
||||
|
||||
// G1 pre/post barriers
|
||||
void g1_write_barrier_pre(Node* obj,
|
||||
void g1_write_barrier_pre(bool do_load,
|
||||
Node* obj,
|
||||
Node* adr,
|
||||
uint alias_idx,
|
||||
Node* val,
|
||||
const TypeOopPtr* val_type,
|
||||
Node* pre_val,
|
||||
BasicType bt);
|
||||
|
||||
void g1_write_barrier_post(Node* store,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue