Mercurial > hg > graal-compiler
diff src/share/vm/runtime/os.cpp @ 12220:8e94527f601e
8024007: Misc. cleanup of static agent code
Summary: Minor cleanup of static agent code from 8014135
Reviewed-by: dcubed, sspitsyn
author | bpittore |
---|---|
date | Wed, 11 Sep 2013 20:03:34 -0400 |
parents | c636758ea616 |
children | 179cd89fb279 |
line wrap: on
line diff
--- a/src/share/vm/runtime/os.cpp Fri Sep 06 11:11:19 2013 -0700 +++ b/src/share/vm/runtime/os.cpp Wed Sep 11 20:03:34 2013 -0400 @@ -454,6 +454,7 @@ */ void* os::find_agent_function(AgentLibrary *agent_lib, bool check_lib, const char *syms[], size_t syms_len) { + assert(agent_lib != NULL, "sanity check"); const char *lib_name; void *handle = agent_lib->os_lib(); void *entryName = NULL; @@ -484,6 +485,7 @@ void *proc_handle; void *save_handle; + assert(agent_lib != NULL, "sanity check"); if (agent_lib->name() == NULL) { return false; } @@ -493,14 +495,13 @@ // We want to look in this process' symbol table. agent_lib->set_os_lib(proc_handle); ret = find_agent_function(agent_lib, true, syms, syms_len); - agent_lib->set_os_lib(save_handle); if (ret != NULL) { // Found an entry point like Agent_OnLoad_lib_name so we have a static agent - agent_lib->set_os_lib(proc_handle); agent_lib->set_valid(); agent_lib->set_static_lib(true); return true; } + agent_lib->set_os_lib(save_handle); return false; }