Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hotspot/cpu/aarch64/immediate_aarch64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ static uint64_t replicate(uint64_t bits, int nbits, int count)
// more convoluted than is really necessary.

static int expandLogicalImmediate(uint32_t immN, uint32_t immr,
uint32_t imms, uint64_t &bimm)
uint32_t imms, uint64_t &bimm)
{
int len; // ought to be <= 6
uint32_t levels; // 6 bits
Expand Down
5 changes: 3 additions & 2 deletions src/hotspot/cpu/x86/macroAssembler_x86.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4087,8 +4087,9 @@ static void restore_xmm_register(MacroAssembler* masm, int offset, XMMRegister r
}
}

static int register_section_sizes(RegSet gp_registers, XMMRegSet xmm_registers, bool save_fpu,
int& gp_area_size, int& fp_area_size, int& xmm_area_size) {
static int register_section_sizes(RegSet gp_registers, XMMRegSet xmm_registers,
bool save_fpu, int& gp_area_size,
int& fp_area_size, int& xmm_area_size) {

gp_area_size = align_up(gp_registers.size() * Register::max_slots_per_register * VMRegImpl::stack_slot_size,
StackAlignmentInBytes);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/x86/peephole_x86_64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// mov d, s1; shl d, s2 into
// lea d, [s1 << s2] with s2 = 1, 2, 3
static bool lea_coalesce_helper(Block* block, int block_index, PhaseCFG* cfg_, PhaseRegAlloc* ra_,
MachNode* (*new_root)(), uint inst0_rule, bool imm) {
MachNode* (*new_root)(), uint inst0_rule, bool imm) {
MachNode* inst0 = block->get_node(block_index)->as_Mach();
assert(inst0->rule() == inst0_rule, "sanity");

Expand Down
6 changes: 3 additions & 3 deletions src/hotspot/cpu/x86/x86_64.ad
Original file line number Diff line number Diff line change
Expand Up @@ -559,9 +559,9 @@ static void emit_cmpfp3(MacroAssembler& _masm, Register dst) {
// |-jz -> a | b # a & b
// | -> a #
static void emit_fp_min_max(MacroAssembler& _masm, XMMRegister dst,
XMMRegister a, XMMRegister b,
XMMRegister xmmt, Register rt,
bool min, bool single) {
XMMRegister a, XMMRegister b,
XMMRegister xmmt, Register rt,
bool min, bool single) {

Label nan, zero, below, above, done;

Expand Down
3 changes: 2 additions & 1 deletion src/hotspot/os/bsd/os_bsd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
}
#endif // !__APPLE__

static int _print_dll_info_cb(const char * name, address base_address, address top_address, void * param) {
static int _print_dll_info_cb(const char * name, address base_address,
address top_address, void * param) {
outputStream * out = (outputStream *) param;
out->print_cr(INTPTR_FORMAT " \t%s", (intptr_t)base_address, name);
return 0;
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/cds/filemap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1665,8 +1665,8 @@ void FileMapInfo::close() {
* Same as os::map_memory() but also pretouches if AlwaysPreTouch is enabled.
*/
static char* map_memory(int fd, const char* file_name, size_t file_offset,
char *addr, size_t bytes, bool read_only,
bool allow_exec, MEMFLAGS flags = mtNone) {
char *addr, size_t bytes, bool read_only,
bool allow_exec, MEMFLAGS flags = mtNone) {
char* mem = os::map_memory(fd, file_name, file_offset, addr, bytes,
AlwaysPreTouch ? false : read_only,
allow_exec, flags);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/classfile/classLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ const char* ClassLoader::file_name_for_class_name(const char* class_name,
}

static ClassPathEntry* find_first_module_cpe(ModuleEntry* mod_entry,
const GrowableArray<ModuleClassPathList*>* const module_list) {
const GrowableArray<ModuleClassPathList*>* const module_list) {
int num_of_entries = module_list->length();
const Symbol* class_module_name = mod_entry->name();

Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/classfile/loaderConstraints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ void LoaderConstraintTable::purge_loader_constraints() {
}

static void log_ldr_constraint_msg(Symbol* class_name, const char* reason,
ClassLoaderData* loader1, ClassLoaderData* loader2) {
ClassLoaderData* loader1, ClassLoaderData* loader2) {
LogTarget(Info, class, loader, constraints) lt;
if (lt.is_enabled()) {
ResourceMark rm;
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/classfile/placeholders.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void PlaceholderEntry::set_supername(Symbol* supername) {
// SystemDictionary_lock, so we don't need special precautions
// on store ordering here.
static PlaceholderEntry* add_entry(Symbol* class_name, ClassLoaderData* loader_data,
Symbol* supername){
Symbol* supername){
assert_locked_or_safepoint(SystemDictionary_lock);
assert(class_name != nullptr, "adding nullptr obj");

Expand Down
20 changes: 10 additions & 10 deletions src/hotspot/share/gc/z/zDirector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ static double select_young_gc_workers(const ZDirectorStats& stats, double serial
}

static ZDriverRequest rule_minor_allocation_rate_dynamic(const ZDirectorStats& stats,
double serial_gc_time_passed,
double parallel_gc_time_passed,
bool conservative_alloc_rate,
size_t capacity) {
double serial_gc_time_passed,
double parallel_gc_time_passed,
bool conservative_alloc_rate,
size_t capacity) {
if (!stats._old_stats._cycle._is_time_trustable) {
// Rule disabled
return ZDriverRequest(GCCause::_no_gc, ZYoungGCThreads, 0);
Expand Down Expand Up @@ -215,8 +215,8 @@ static ZDriverRequest rule_minor_allocation_rate_dynamic(const ZDirectorStats& s
}

static ZDriverRequest rule_soft_minor_allocation_rate_dynamic(const ZDirectorStats& stats,
double serial_gc_time_passed,
double parallel_gc_time_passed) {
double serial_gc_time_passed,
double parallel_gc_time_passed) {
return rule_minor_allocation_rate_dynamic(stats,
0.0 /* serial_gc_time_passed */,
0.0 /* parallel_gc_time_passed */,
Expand All @@ -225,8 +225,8 @@ static ZDriverRequest rule_soft_minor_allocation_rate_dynamic(const ZDirectorSta
}

static ZDriverRequest rule_semi_hard_minor_allocation_rate_dynamic(const ZDirectorStats& stats,
double serial_gc_time_passed,
double parallel_gc_time_passed) {
double serial_gc_time_passed,
double parallel_gc_time_passed) {
return rule_minor_allocation_rate_dynamic(stats,
0.0 /* serial_gc_time_passed */,
0.0 /* parallel_gc_time_passed */,
Expand All @@ -235,8 +235,8 @@ static ZDriverRequest rule_semi_hard_minor_allocation_rate_dynamic(const ZDirect
}

static ZDriverRequest rule_hard_minor_allocation_rate_dynamic(const ZDirectorStats& stats,
double serial_gc_time_passed,
double parallel_gc_time_passed) {
double serial_gc_time_passed,
double parallel_gc_time_passed) {
return rule_minor_allocation_rate_dynamic(stats,
0.0 /* serial_gc_time_passed */,
0.0 /* parallel_gc_time_passed */,
Expand Down
8 changes: 4 additions & 4 deletions src/hotspot/share/memory/universe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -925,10 +925,10 @@ void universe_oopstorage_init() {
}

static void initialize_known_method(LatestMethodCache* method_cache,
InstanceKlass* ik,
const char* method,
Symbol* signature,
bool is_static, TRAPS)
InstanceKlass* ik,
const char* method,
Symbol* signature,
bool is_static, TRAPS)
{
TempNewSymbol name = SymbolTable::new_symbol(method);
Method* m = nullptr;
Expand Down
3 changes: 2 additions & 1 deletion src/hotspot/share/nmt/memBaseline.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023, 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
Expand Down Expand Up @@ -320,3 +320,4 @@ void MemBaseline::virtual_memory_sites_to_reservation_site_order() {
_virtual_memory_sites_order = by_size;
}
}

2 changes: 1 addition & 1 deletion src/hotspot/share/opto/doCall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static void print_trace_type_profile(outputStream* out, int depth, ciKlass* prof
}

static void trace_type_profile(Compile* C, ciMethod* method, int depth, int bci, ciMethod* prof_method,
ciKlass* prof_klass, int site_count, int receiver_count) {
ciKlass* prof_klass, int site_count, int receiver_count) {
if (TraceTypeProfile || C->print_inlining()) {
outputStream* out = tty;
if (!C->print_inlining()) {
Expand Down