Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
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/x86/vm_version_x86.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,7 @@ void VM_Version::get_processor_features() {
if (ArrayOperationPartialInlineSize > MaxVectorSize) {
ArrayOperationPartialInlineSize = MaxVectorSize >= 16 ? MaxVectorSize : 0;
if (ArrayOperationPartialInlineSize) {
warning("Setting ArrayOperationPartialInlineSize as MaxVectorSize%zd)", MaxVectorSize);
warning("Setting ArrayOperationPartialInlineSize as MaxVectorSize=%zd", MaxVectorSize);
} else {
warning("Setting ArrayOperationPartialInlineSize as %zd", ArrayOperationPartialInlineSize);
}
Expand Down
12 changes: 3 additions & 9 deletions src/hotspot/os/linux/os_linux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1366,12 +1366,9 @@ void os::Linux::capture_initial_stack(size_t max_size) {
// Skip blank chars
do { s++; } while (s && isspace((unsigned char) *s));

#define _UFM "%zu"
#define _DFM "%zd"

// 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2
// 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8
i = sscanf(s, "%c %d %d %d %d %d %lu %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %ld %ld " _UFM _UFM _DFM _UFM _UFM _UFM _UFM,
// 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2
// 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8
i = sscanf(s, "%c %d %d %d %d %d %lu %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %ld %ld %zu %zu %zd %zu %zu %zu %zu",
&state, // 3 %c
&ppid, // 4 %d
&pgrp, // 5 %d
Expand Down Expand Up @@ -1400,9 +1397,6 @@ void os::Linux::capture_initial_stack(size_t max_size) {
&stack_start); // 28 %zu
}

#undef _UFM
#undef _DFM

if (i != 28 - 2) {
assert(false, "Bad conversion from /proc/self/stat");
// product mode - assume we are the primordial thread, good luck in the
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/ci/ciMethodData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ void ciMethodData::dump_replay_data(outputStream* out) {
// We could use INTPTR_FORMAT here but that's zero justified
// which makes comparing it with the SA version of this output
// harder. data()'s element type is intptr_t.
out->print(" 0x%zx", data()[i]);
out->print(" %#zx", data()[i]);
}

// The MDO contained oop references as ciObjects, so scan for those
Expand Down
3 changes: 0 additions & 3 deletions src/hotspot/share/gc/shared/ageTable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
#include "utilities/copy.hpp"
#include "logging/logStream.hpp"

/* Copyright (c) 1992, 2025, Oracle and/or its affiliates, and Stanford University.
See the LICENSE file for license information. */

AgeTable::AgeTable(bool global) : _use_perf_data(UsePerfData && global) {

clear();
Expand Down
4 changes: 2 additions & 2 deletions test/hotspot/gtest/utilities/test_globalDefinitions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -278,12 +278,12 @@ TEST(globalDefinitions, format_specifiers) {
check_format(SIZE_FORMAT_W(-5), (size_t)123u, "123 ");

check_format("%zd", (intx)123, "123");
check_format("0x%zx", (intx)0x123, "0x123");
check_format("%#zx", (intx)0x123, "0x123");
check_format("%5zd", (intx)123, " 123");
check_format("%-5zd", (intx)123, "123 ");

check_format("%zu", (uintx)123u, "123");
check_format("0x%zx", (uintx)0x123u, "0x123");
check_format("%#zx", (uintx)0x123u, "0x123");
check_format("%5zu", (uintx)123u, " 123");
check_format("%-5zu", (uintx)123u, "123 ");

Expand Down