equal
deleted
inserted
replaced
1516 BasicType bt) { |
1516 BasicType bt) { |
1517 |
1517 |
1518 BarrierSet* bs = Universe::heap()->barrier_set(); |
1518 BarrierSet* bs = Universe::heap()->barrier_set(); |
1519 set_control(ctl); |
1519 set_control(ctl); |
1520 switch (bs->kind()) { |
1520 switch (bs->kind()) { |
1521 case BarrierSet::G1SATBCT: |
|
1522 case BarrierSet::G1SATBCTLogging: |
1521 case BarrierSet::G1SATBCTLogging: |
1523 g1_write_barrier_pre(do_load, obj, adr, adr_idx, val, val_type, pre_val, bt); |
1522 g1_write_barrier_pre(do_load, obj, adr, adr_idx, val, val_type, pre_val, bt); |
1524 break; |
1523 break; |
1525 |
1524 |
1526 case BarrierSet::CardTableModRef: |
1525 case BarrierSet::CardTableModRef: |
1535 } |
1534 } |
1536 |
1535 |
1537 bool GraphKit::can_move_pre_barrier() const { |
1536 bool GraphKit::can_move_pre_barrier() const { |
1538 BarrierSet* bs = Universe::heap()->barrier_set(); |
1537 BarrierSet* bs = Universe::heap()->barrier_set(); |
1539 switch (bs->kind()) { |
1538 switch (bs->kind()) { |
1540 case BarrierSet::G1SATBCT: |
|
1541 case BarrierSet::G1SATBCTLogging: |
1539 case BarrierSet::G1SATBCTLogging: |
1542 return true; // Can move it if no safepoint |
1540 return true; // Can move it if no safepoint |
1543 |
1541 |
1544 case BarrierSet::CardTableModRef: |
1542 case BarrierSet::CardTableModRef: |
1545 case BarrierSet::CardTableExtension: |
1543 case BarrierSet::CardTableExtension: |
1561 BasicType bt, |
1559 BasicType bt, |
1562 bool use_precise) { |
1560 bool use_precise) { |
1563 BarrierSet* bs = Universe::heap()->barrier_set(); |
1561 BarrierSet* bs = Universe::heap()->barrier_set(); |
1564 set_control(ctl); |
1562 set_control(ctl); |
1565 switch (bs->kind()) { |
1563 switch (bs->kind()) { |
1566 case BarrierSet::G1SATBCT: |
|
1567 case BarrierSet::G1SATBCTLogging: |
1564 case BarrierSet::G1SATBCTLogging: |
1568 g1_write_barrier_post(store, obj, adr, adr_idx, val, bt, use_precise); |
1565 g1_write_barrier_post(store, obj, adr, adr_idx, val, bt, use_precise); |
1569 break; |
1566 break; |
1570 |
1567 |
1571 case BarrierSet::CardTableModRef: |
1568 case BarrierSet::CardTableModRef: |