Skip to content

8198918: jio_snprintf and friends are not checked by -Wformat #15918

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 2 commits into from
Closed

8198918: jio_snprintf and friends are not checked by -Wformat #15918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb1735
8198918: jio_snprintf and friends are not checked by -Wformat
afshin-zafari Sep 26, 2023
f3d2c62
Review's comments applied.
afshin-zafari Oct 9, 2023
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/share/compiler/compilationPolicy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ void CompilationPolicy::initialize() {
c2_size = C2Compiler::initial_code_buffer_size();
#endif
size_t buffer_size = c1_only ? c1_size : (c1_size/3 + 2*c2_size/3);
int max_count = (ReservedCodeCacheSize - (CodeCacheMinimumUseSpace DEBUG_ONLY(* 3))) / (int)buffer_size;
int max_count = ((int)ReservedCodeCacheSize - (CodeCacheMinimumUseSpace DEBUG_ONLY(* 3))) / (int)buffer_size;
if (count > max_count) {
// Lower the compiler count such that all buffers fit into the code cache
count = MAX2(max_count, c1_only ? 1 : 2);
Expand Down
10 changes: 5 additions & 5 deletions src/hotspot/share/compiler/compilerDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,26 +476,26 @@ void CompilerConfig::set_jvmci_specific_flags() {
bool CompilerConfig::check_args_consistency(bool status) {
// Check lower bounds of the code cache
// Template Interpreter code is approximately 3X larger in debug builds.
uint min_code_cache_size = CodeCacheMinimumUseSpace DEBUG_ONLY(* 3);
size_t min_code_cache_size = CodeCacheMinimumUseSpace DEBUG_ONLY(* 3);
if (ReservedCodeCacheSize < InitialCodeCacheSize) {
jio_fprintf(defaultStream::error_stream(),
"Invalid ReservedCodeCacheSize: %dK. Must be at least InitialCodeCacheSize=%dK.\n",
"Invalid ReservedCodeCacheSize: %zuK. Must be at least InitialCodeCacheSize=%zuK.\n",
ReservedCodeCacheSize/K, InitialCodeCacheSize/K);
status = false;
} else if (ReservedCodeCacheSize < min_code_cache_size) {
jio_fprintf(defaultStream::error_stream(),
"Invalid ReservedCodeCacheSize=%dK. Must be at least %uK.\n", ReservedCodeCacheSize/K,
"Invalid ReservedCodeCacheSize=%zuK. Must be at least %zuK.\n", ReservedCodeCacheSize/K,
min_code_cache_size/K);
status = false;
} else if (ReservedCodeCacheSize > CODE_CACHE_SIZE_LIMIT) {
// Code cache size larger than CODE_CACHE_SIZE_LIMIT is not supported.
jio_fprintf(defaultStream::error_stream(),
"Invalid ReservedCodeCacheSize=%dM. Must be at most %uM.\n", ReservedCodeCacheSize/M,
"Invalid ReservedCodeCacheSize=%zuM. Must be at most %zuM.\n", ReservedCodeCacheSize/M,
CODE_CACHE_SIZE_LIMIT/M);
status = false;
} else if (NonNMethodCodeHeapSize < min_code_cache_size) {
jio_fprintf(defaultStream::error_stream(),
"Invalid NonNMethodCodeHeapSize=%dK. Must be at least %uK.\n", NonNMethodCodeHeapSize/K,
"Invalid NonNMethodCodeHeapSize=%zuK. Must be at least %zuK.\n", NonNMethodCodeHeapSize/K,
min_code_cache_size/K);
status = false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/compiler/compilerOracle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ TypedMethodOptionMatcher* TypedMethodOptionMatcher::parse_method_pattern(char*&
TypedMethodOptionMatcher* tom = new TypedMethodOptionMatcher();
MethodMatcher::parse_method_pattern(line, error_msg, tom);
if (error_msg != nullptr) {
jio_snprintf(errorbuf, buf_size, error_msg);
::strncpy(errorbuf, error_msg, buf_size);
delete tom;
return nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/jvmci/jvmci_globals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
}
if (BootstrapJVMCI && (TieredStopAtLevel < CompLevel_full_optimization)) {
jio_fprintf(defaultStream::error_stream(),
"-XX:+BootstrapJVMCI is not compatible with -XX:TieredStopAtLevel=%d\n", TieredStopAtLevel);
"-XX:+BootstrapJVMCI is not compatible with -XX:TieredStopAtLevel=" INTX_FORMAT "\n", TieredStopAtLevel);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The real problem here is that TieredStopAtLevel is inappropriately declared to be an intx.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change required changes to 18 Java files and then many test failures in mach5 tiers tests. So, I removed the changes to avoid diverging from this PR.

return false;
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/hotspot/share/prims/jvm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2855,7 +2855,6 @@ JVM_END
// Printing support //////////////////////////////////////////////////
extern "C" {

ATTRIBUTE_PRINTF(3, 0)
int jio_vsnprintf(char *str, size_t count, const char *fmt, va_list args) {
// Reject count values that are negative signed values converted to
// unsigned; see bug 4399518, 4417214
Expand All @@ -2869,7 +2868,6 @@ int jio_vsnprintf(char *str, size_t count, const char *fmt, va_list args) {
return result;
}

ATTRIBUTE_PRINTF(3, 4)
int jio_snprintf(char *str, size_t count, const char *fmt, ...) {
va_list args;
int len;
Expand All @@ -2879,7 +2877,6 @@ int jio_snprintf(char *str, size_t count, const char *fmt, ...) {
return len;
}

ATTRIBUTE_PRINTF(2, 3)
int jio_fprintf(FILE* f, const char *fmt, ...) {
int len;
va_list args;
Expand All @@ -2889,7 +2886,6 @@ int jio_fprintf(FILE* f, const char *fmt, ...) {
return len;
}

ATTRIBUTE_PRINTF(2, 0)
int jio_vfprintf(FILE* f, const char *fmt, va_list args) {
if (Arguments::vfprintf_hook() != nullptr) {
return Arguments::vfprintf_hook()(f, fmt, args);
Expand All @@ -2898,7 +2894,6 @@ int jio_vfprintf(FILE* f, const char *fmt, va_list args) {
}
}

ATTRIBUTE_PRINTF(1, 2)
JNIEXPORT int jio_printf(const char *fmt, ...) {
int len;
va_list args;
Expand Down
14 changes: 7 additions & 7 deletions src/hotspot/share/runtime/globals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ const int ObjectAlignmentInBytes = 8;
range(1, 128) \
constraint(OptoLoopAlignmentConstraintFunc, AfterErgo) \
\
product_pd(uintx, InitialCodeCacheSize, \
product_pd(size_t, InitialCodeCacheSize, \
"Initial code cache size (in bytes)") \
constraint(VMPageSizeConstraintFunc, AtParse) \
\
Expand All @@ -1548,19 +1548,19 @@ const int ObjectAlignmentInBytes = 8;
product(bool, SegmentedCodeCache, false, \
"Use a segmented code cache") \
\
product_pd(uintx, ReservedCodeCacheSize, \
product_pd(size_t, ReservedCodeCacheSize, \
"Reserved code cache size (in bytes) - maximum code cache size") \
constraint(VMPageSizeConstraintFunc, AtParse) \
\
product_pd(uintx, NonProfiledCodeHeapSize, \
"Size of code heap with non-profiled methods (in bytes)") \
product_pd(size_t, NonProfiledCodeHeapSize, \
"Size of code heap with non-profiled methods (in bytes)") \
range(0, max_uintx) \
\
product_pd(uintx, ProfiledCodeHeapSize, \
"Size of code heap with profiled methods (in bytes)") \
product_pd(size_t, ProfiledCodeHeapSize, \
"Size of code heap with profiled methods (in bytes)") \
range(0, max_uintx) \
\
product_pd(uintx, NonNMethodCodeHeapSize, \
product_pd(size_t, NonNMethodCodeHeapSize, \
"Size of code heap with non-nmethods (in bytes)") \
constraint(VMPageSizeConstraintFunc, AtParse) \
\
Expand Down
6 changes: 3 additions & 3 deletions src/hotspot/share/runtime/os.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ char* os::iso8601_time(jlong milliseconds_since_19700101, char* buffer, size_t b
abs_local_to_UTC = -(abs_local_to_UTC);
}
// Convert time zone offset seconds to hours and minutes.
const time_t zone_hours = (abs_local_to_UTC / seconds_per_hour);
const time_t zone_min =
((abs_local_to_UTC % seconds_per_hour) / seconds_per_minute);
const int zone_hours = (int)(abs_local_to_UTC / seconds_per_hour);
const int zone_min =
(int)((abs_local_to_UTC % seconds_per_hour) / seconds_per_minute);

// Print an ISO 8601 date and time stamp into the buffer
const int year = 1900 + time_struct.tm_year;
Expand Down
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

public class RandomAllocationTest implements Runnable {
private static final long CODE_CACHE_SIZE
= Helper.WHITE_BOX.getUintxVMFlag("ReservedCodeCacheSize");
= Helper.WHITE_BOX.getSizeTVMFlag("ReservedCodeCacheSize");
private static final int MAX_BLOB_SIZE = (int) (CODE_CACHE_SIZE >> 7);
private static final BlobType[] BLOB_TYPES
= BlobType.getAvailable().toArray(new BlobType[0]);
Expand Down
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import java.util.ArrayList;

public class ReturnBlobToWrongHeapTest {
private static final long largeBlobSize = Helper.WHITE_BOX.getUintxVMFlag("ReservedCodeCacheSize") >> 6;
private static final long largeBlobSize = Helper.WHITE_BOX.getSizeTVMFlag("ReservedCodeCacheSize") >> 6;
private static final long codeCacheMinBlockLength = Helper.WHITE_BOX.getUintxVMFlag("CodeCacheMinBlockLength");
private static final BlobType[] BLOB_TYPES = BlobType.getAvailable().toArray(new BlobType[0]);

Expand Down
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/compiler/whitebox/AllocationCodeBlobTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
public class AllocationCodeBlobTest {
private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
private static final long CODE_CACHE_SIZE
= WHITE_BOX.getUintxVMFlag("ReservedCodeCacheSize");
= WHITE_BOX.getSizeTVMFlag("ReservedCodeCacheSize");
private static final int SIZE = 1;

public static void main(String[] args) {
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/jdk/jfr/event/compiler/TestCodeCacheConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
public class TestCodeCacheConfig {
private final static String EVENT_NAME = EventNames.CodeCacheConfiguration;

private static final long CodeCacheExpectedSize = WhiteBox.getWhiteBox().getUintxVMFlag("ReservedCodeCacheSize");
private static final long CodeCacheExpectedSize = WhiteBox.getWhiteBox().getSizeTVMFlag("ReservedCodeCacheSize");

public static void main(String[] args) throws Exception {
Recording recording = new Recording();
Expand Down
2 changes: 1 addition & 1 deletion test/lib/jdk/test/whitebox/code/BlobType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ public static EnumSet<BlobType> getAvailable() {
}

public long getSize() {
return WhiteBox.getWhiteBox().getUintxVMFlag(sizeOptionName);
return WhiteBox.getWhiteBox().getSizeTVMFlag(sizeOptionName);
}
}