Skip to content

8346990: Remove INTX_FORMAT and UINTX_FORMAT macros #22916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

8346990: Remove INTX_FORMAT and UINTX_FORMAT macros #22916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d6fbfa
8346990: Remove INTX_FORMAT and UINTX_FORMAT macros
coleenp Jan 3, 2025
1748797
Fix %Ix to %zx.
coleenp Jan 3, 2025
15b1052
Fixed some code review comments.
coleenp Jan 6, 2025
6e8b270
Use INTPTR_FORMAT instead of zu for secondary_supers_bitmap.
coleenp Jan 6, 2025
ae9d9f6
Restore copyright and macro.
coleenp Jan 7, 2025
763c390
Add Oracle copyright to shenandoah files for this change.
coleenp Jan 13, 2025
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
3 changes: 3 additions & 0 deletions src/hotspot/share/gc/shared/ageTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
#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
2 changes: 1 addition & 1 deletion src/hotspot/share/oops/instanceKlass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3692,7 +3692,7 @@ void InstanceKlass::print_on(outputStream* st) const {
st->print(BULLET"secondary supers: "); secondary_supers()->print_value_on(st); st->cr();

st->print(BULLET"hash_slot: %d", hash_slot()); st->cr();
st->print(BULLET"secondary bitmap: " INTPTR_FORMAT, _secondary_supers_bitmap); st->cr();
st->print(BULLET"secondary bitmap: " UINTX_FORMAT_X_0, _secondary_supers_bitmap); st->cr();

if (secondary_supers() != nullptr) {
if (Verbose) {
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/oops/klass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,7 @@ static void print_negative_lookup_stats(uintx bitmap, outputStream* st) {
void Klass::print_secondary_supers_on(outputStream* st) const {
if (secondary_supers() != nullptr) {
st->print(" - "); st->print("%d elements;", _secondary_supers->length());
st->print_cr(" bitmap: " INTPTR_FORMAT, _secondary_supers_bitmap);
st->print_cr(" bitmap: " UINTX_FORMAT_X_0, _secondary_supers_bitmap);
if (_secondary_supers_bitmap != SECONDARY_SUPERS_BITMAP_EMPTY &&
_secondary_supers_bitmap != SECONDARY_SUPERS_BITMAP_FULL) {
st->print(" - "); print_positive_lookup_stats(secondary_supers(),
Expand Down
4 changes: 3 additions & 1 deletion src/hotspot/share/utilities/globalDefinitions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,15 @@ class oopDesc;
#define JULONG_FORMAT_X UINT64_FORMAT_X
#endif

// Format pointers which change size between 32- and 64-bit.
// Format pointers and padded integral values which change size between 32- and 64-bit.
#ifdef _LP64
#define INTPTR_FORMAT "0x%016" PRIxPTR
#define PTR_FORMAT "0x%016" PRIxPTR
#define UINTX_FORMAT_X_0 "0x%016" PRIxPTR
#else // !_LP64
#define INTPTR_FORMAT "0x%08" PRIxPTR
#define PTR_FORMAT "0x%08" PRIxPTR
#define UINTX_FORMAT_X_0 "0x%08" PRIxPTR
#endif // _LP64

// Convert pointer to intptr_t, for use in printing pointers.
Expand Down