mirror of
https://github.com/openjdk/jdk.git
synced 2026-05-20 10:27:52 +00:00
8368214: ZGC: Remove double newlines
Reviewed-by: stefank, jsikstro
This commit is contained in:
parent
942b21772a
commit
43531064c2
@ -275,7 +275,6 @@ public:
|
||||
Label* entry();
|
||||
};
|
||||
|
||||
|
||||
class ZStoreBarrierStubC2Aarch64 : public ZStoreBarrierStubC2 {
|
||||
private:
|
||||
bool _deferred_emit;
|
||||
|
||||
@ -239,7 +239,6 @@ instruct zCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP ne
|
||||
ins_pipe(pipe_slow);
|
||||
%}
|
||||
|
||||
|
||||
instruct zCompareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp oldval_tmp, iRegPNoSp newval_tmp, rFlagsReg cr) %{
|
||||
match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
|
||||
predicate(UseZGC && !needs_acquiring_load_exclusive(n) && n->as_LoadStore()->barrier_data() != 0);
|
||||
|
||||
@ -114,7 +114,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
void ZBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
|
||||
Register base, RegisterOrConstant ind_or_offs, Register dst,
|
||||
Register tmp1, Register tmp2,
|
||||
@ -561,7 +560,6 @@ void ZBarrierSetAssembler::generate_conjoint_oop_copy(MacroAssembler* masm, bool
|
||||
copy_store_at_slow(masm, R4_ARG2, tmp, store_bad, store_good, dest_uninitialized);
|
||||
}
|
||||
|
||||
|
||||
// Verify a colored pointer.
|
||||
void ZBarrierSetAssembler::check_oop(MacroAssembler *masm, Register obj, const char* msg) {
|
||||
if (!VerifyOops) {
|
||||
@ -583,7 +581,6 @@ void ZBarrierSetAssembler::check_oop(MacroAssembler *masm, Register obj, const c
|
||||
__ bind(done);
|
||||
}
|
||||
|
||||
|
||||
void ZBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Register dst, Register jni_env,
|
||||
Register obj, Register tmp, Label& slowpath) {
|
||||
__ block_comment("try_resolve_jobject_in_native (zgc) {");
|
||||
|
||||
@ -1410,11 +1410,9 @@ void ZBarrierSetAssembler::patch_barriers() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#undef __
|
||||
#define __ masm->
|
||||
|
||||
|
||||
void ZBarrierSetAssembler::check_oop(MacroAssembler* masm, Register obj, Register tmp1, Register tmp2, Label& error) {
|
||||
// C1 calls verfy_oop in the middle of barriers, before they have been uncolored
|
||||
// and after being colored. Therefore, we must deal with colored oops as well.
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
// Support for building on older Linux systems
|
||||
//
|
||||
|
||||
|
||||
#ifndef SYS_memfd_create
|
||||
#define SYS_memfd_create 360
|
||||
#endif
|
||||
|
||||
@ -349,7 +349,6 @@ inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one_ch
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
template <DecoratorSet decorators, typename BarrierSetT>
|
||||
inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_check_cast(zpointer* dst, zpointer* src, size_t length, Klass* dst_klass) {
|
||||
// Check cast and copy each elements
|
||||
|
||||
@ -661,7 +661,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
bool ZGenerationYoung::pause_mark_end() {
|
||||
return VM_ZMarkEndYoung().pause();
|
||||
}
|
||||
@ -1320,7 +1319,6 @@ class ZRendezvousGCThreads: public VM_Operation {
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
void ZGenerationOld::process_non_strong_references() {
|
||||
// Process Soft/Weak/Final/PhantomReferences
|
||||
_reference_processor.process_references();
|
||||
|
||||
@ -388,7 +388,6 @@ void ZMark::follow_object(oop obj, bool finalizable) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ZMark::mark_and_follow(ZMarkContext* context, ZMarkStackEntry entry) {
|
||||
// Decode flags
|
||||
const bool finalizable = entry.finalizable();
|
||||
|
||||
@ -368,7 +368,6 @@ inline bool ZPage::was_remembered(volatile zpointer* p) {
|
||||
return _remembered_set.at_previous(l_offset);
|
||||
}
|
||||
|
||||
|
||||
inline zaddress_unsafe ZPage::find_base_unsafe(volatile zpointer* p) {
|
||||
if (is_large()) {
|
||||
return ZOffset::address_unsafe(start());
|
||||
|
||||
@ -1051,7 +1051,6 @@ void ZPartition::copy_physical_segments_from_partition(const ZVirtualMemory& at,
|
||||
|
||||
ZPhysicalMemoryManager& manager = physical_memory_manager();
|
||||
|
||||
|
||||
// Copy segments
|
||||
manager.copy_physical_segments(to, at);
|
||||
}
|
||||
|
||||
@ -671,7 +671,6 @@ private:
|
||||
assert(ZHeap::heap()->is_in_page_relaxed(from_page, from_addr), "Must be");
|
||||
assert(to_page->is_in(to_addr), "Must be");
|
||||
|
||||
|
||||
// Read the size from the to-object, since the from-object
|
||||
// could have been overwritten during in-place relocation.
|
||||
const size_t size = ZUtils::object_size(to_addr);
|
||||
|
||||
@ -238,5 +238,4 @@ inline bool ZValueConstIterator<S, T>::next(const T** value) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
#endif // SHARE_GC_Z_ZVALUE_INLINE_HPP
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
#include "gc/z/zRangeRegistry.inline.hpp"
|
||||
#include "utilities/globalDefinitions.hpp"
|
||||
|
||||
|
||||
inline bool ZVirtualMemoryManager::is_multi_partition_enabled() const {
|
||||
return _is_multi_partition_enabled;
|
||||
}
|
||||
|
||||
@ -59,7 +59,6 @@ public class TestZNMT {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static void testValue(int zForceDiscontiguousHeapReservations) throws Exception {
|
||||
/**
|
||||
* Xmx is picked so that it is divisible by 'ZForceDiscontiguousHeapReservations * ZGranuleSize'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user