stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8306282: Build failure linux-arm32-open-cmp-baseline after JDK-8257967

Browse Source 
Reviewed-by: egahlin, iklam
This commit is contained in:
Markus Grönlund 2023-04-18 16:00:40 +00:00
parent 803680f17a
commit 0f3828dddd
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hotspot/share/prims/jvmtiAgent.hpp
View File

@ -58,20 +58,20 @@ class JvmtiAgent : public CHeapObj<mtServiceability> {
public: public:
JvmtiAgent(const char* name, const char* options, bool is_absolute_path, bool dynamic = false); JvmtiAgent(const char* name, const char* options, bool is_absolute_path, bool dynamic = false);
const char* name() const; const char* name() const NOT_JVMTI_RETURN_(nullptr);
const char* options() const; const char* options() const;
bool is_absolute_path() const; bool is_absolute_path() const NOT_JVMTI_RETURN_(false);
void* os_lib() const; void* os_lib() const NOT_JVMTI_RETURN_(nullptr);
void set_os_lib(void* os_lib); void set_os_lib(void* os_lib);
const char* os_lib_path() const; const char* os_lib_path() const;
void set_os_lib_path(const char* path); void set_os_lib_path(const char* path) NOT_JVMTI_RETURN;
bool is_static_lib() const; bool is_static_lib() const NOT_JVMTI_RETURN_(false);
void set_static_lib(); void set_static_lib() NOT_JVMTI_RETURN;
bool is_dynamic() const; bool is_dynamic() const;
bool is_xrun() const; bool is_xrun() const;
bool is_instrument_lib() const; bool is_instrument_lib() const;
bool is_loaded() const; bool is_loaded() const NOT_JVMTI_RETURN_(false);
void set_loaded(); void set_loaded() NOT_JVMTI_RETURN;
bool is_jplis() const; bool is_jplis() const;
bool is_jplis(JvmtiEnv* env) const; bool is_jplis(JvmtiEnv* env) const;
void set_jplis(const void* jplis); void set_jplis(const void* jplis);

5
src/hotspot/share/prims/jvmtiAgentList.cpp
View File

@ -28,7 +28,6 @@
#include "prims/jvmtiExport.hpp" #include "prims/jvmtiExport.hpp"
#include "runtime/atomic.hpp" #include "runtime/atomic.hpp"
#include "runtime/os.inline.hpp" #include "runtime/os.inline.hpp"
#include "utilities/growableArray.hpp"
JvmtiAgent* JvmtiAgentList::_list = nullptr; JvmtiAgent* JvmtiAgentList::_list = nullptr;
@ -82,10 +81,6 @@ JvmtiAgentList::Iterator::Iterator(JvmtiAgent** list, Filter filter) :
} }
} }
JvmtiAgentList::Iterator::~Iterator() {
delete _stack;
}
bool JvmtiAgentList::Iterator::has_next() const { bool JvmtiAgentList::Iterator::has_next() const {
assert(_stack != nullptr, "invariant"); assert(_stack != nullptr, "invariant");
return _stack->is_nonempty(); return _stack->is_nonempty();

28
src/hotspot/share/prims/jvmtiAgentList.hpp
View File

@ -27,9 +27,8 @@
#include "memory/allocation.hpp" #include "memory/allocation.hpp"
#include "prims/jvmtiAgent.hpp" #include "prims/jvmtiAgent.hpp"
#include "utilities/growableArray.hpp"
template <typename, MEMFLAGS>
class GrowableArrayCHeap;
class JvmtiEnv; class JvmtiEnv;
// Maintains a single cas linked-list of JvmtiAgents. // Maintains a single cas linked-list of JvmtiAgents.
@ -49,13 +48,14 @@ class JvmtiAgentList : AllStatic {
}; };
GrowableArrayCHeap<JvmtiAgent*, mtServiceability>* _stack; GrowableArrayCHeap<JvmtiAgent*, mtServiceability>* _stack;
const Filter _filter; const Filter _filter;
Iterator() : _stack(nullptr), _filter(ALL) {}
Iterator(JvmtiAgent** list, Filter filter); Iterator(JvmtiAgent** list, Filter filter);
JvmtiAgent* select(JvmtiAgent* agent) const; JvmtiAgent* select(JvmtiAgent* agent) const;
public: public:
bool has_next() const; bool has_next() const NOT_JVMTI_RETURN_(false);
JvmtiAgent* next(); JvmtiAgent* next() NOT_JVMTI_RETURN_(nullptr);
const JvmtiAgent* next() const; const JvmtiAgent* next() const NOT_JVMTI_RETURN_(nullptr);
~Iterator(); ~Iterator() { delete _stack; }
}; };
private: private:
@ -66,19 +66,19 @@ class JvmtiAgentList : AllStatic {
static void convert_xrun_agents(); static void convert_xrun_agents();
public: public:
static void add(JvmtiAgent* agent); static void add(JvmtiAgent* agent) NOT_JVMTI_RETURN;
static void add(const char* name, char* options, bool absolute_path); static void add(const char* name, char* options, bool absolute_path) NOT_JVMTI_RETURN;
static void add_xrun(const char* name, char* options, bool absolute_path); static void add_xrun(const char* name, char* options, bool absolute_path) NOT_JVMTI_RETURN;
static void load_agents(); static void load_agents() NOT_JVMTI_RETURN;
static jint load_agent(const char* agent, const char* absParam, static jint load_agent(const char* agent, const char* absParam,
const char* options, outputStream* st); const char* options, outputStream* st) NOT_JVMTI_RETURN_(0);
static void load_xrun_agents(); static void load_xrun_agents() NOT_JVMTI_RETURN;
static void unload_agents(); static void unload_agents() NOT_JVMTI_RETURN;
static JvmtiAgent* lookup(JvmtiEnv* env, void* f_ptr); static JvmtiAgent* lookup(JvmtiEnv* env, void* f_ptr);
static Iterator agents(); static Iterator agents() NOT_JVMTI({ Iterator it; return it; });
static Iterator java_agents(); static Iterator java_agents();
static Iterator native_agents(); static Iterator native_agents();
static Iterator xrun_agents(); static Iterator xrun_agents();