34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
Subject: Backport of 8337787: Fix -Wzero-as-null-pointer-constant warnings when JVMTI feature is disabled
|
||
|
|
|
||
|
|
---
|
||
|
|
src/hotspot/share/prims/jvmtiExport.hpp | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
|
||
|
|
index 805c8c090..d8e20086b 100644
|
||
|
|
--- a/src/hotspot/share/prims/jvmtiExport.hpp
|
||
|
|
+++ b/src/hotspot/share/prims/jvmtiExport.hpp
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
/*
|
||
|
|
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
|
||
|
|
+ * Copyright (c) 1998, 2024, 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
|
||
|
|
@@ -279,10 +279,10 @@ class JvmtiExport : public AllStatic {
|
||
|
|
}
|
||
|
|
|
||
|
|
// field access management
|
||
|
|
- static address get_field_access_count_addr() NOT_JVMTI_RETURN_(0);
|
||
|
|
+ static address get_field_access_count_addr() NOT_JVMTI_RETURN_(nullptr);
|
||
|
|
|
||
|
|
// field modification management
|
||
|
|
- static address get_field_modification_count_addr() NOT_JVMTI_RETURN_(0);
|
||
|
|
+ static address get_field_modification_count_addr() NOT_JVMTI_RETURN_(nullptr);
|
||
|
|
|
||
|
|
// -----------------
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|