< prev index next >
src/hotspot/share/classfile/resolutionErrors.cpp
Print this page
rev 58760 : 8238358: Implementation of JEP 371: Hidden Classes
Reviewed-by: alanb, cjplummer, coleenp, dholmes, dlong, forax, jlahoda, psandoz, plevart, vromero
Contributed-by: mandy.chung@oracle.com, lois.foltan@oracle.com, david.holmes@oracle.com, harold.seigel@oracle.com, serguei.spitsyn@oracle.com, alex.buckley@oracle.com, jamsheed.c.m@oracle.com, jan.lahoda@oracle.com, amy.lu@oracle.com
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
@@ -22,10 +22,11 @@
*
*/
#include "precompiled.hpp"
#include "classfile/resolutionErrors.hpp"
+#include "memory/allocation.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/safepoint.hpp"
#include "utilities/hashtable.inline.hpp"
@@ -40,10 +41,22 @@
ResolutionErrorEntry* entry = new_entry(hash, pool(), cp_index, error, message);
add_entry(index, entry);
}
+// add new entry to the table
+void ResolutionErrorTable::add_entry(int index, unsigned int hash,
+ const constantPoolHandle& pool, int cp_index,
+ const char* message)
+{
+ assert_locked_or_safepoint(SystemDictionary_lock);
+ assert(!pool.is_null() && message != NULL, "adding NULL obj");
+
+ ResolutionErrorEntry* entry = new_entry(hash, pool(), cp_index, message);
+ add_entry(index, entry);
+}
+
// find entry in the table
ResolutionErrorEntry* ResolutionErrorTable::find_entry(int index, unsigned int hash,
const constantPoolHandle& pool, int cp_index)
{
assert_locked_or_safepoint(SystemDictionary_lock);
@@ -57,42 +70,65 @@
}
return NULL;
}
void ResolutionErrorEntry::set_error(Symbol* e) {
- assert(e != NULL, "must set a value");
_error = e;
+ if (_error != NULL) {
_error->increment_refcount();
+ }
}
void ResolutionErrorEntry::set_message(Symbol* c) {
_message = c;
if (_message != NULL) {
_message->increment_refcount();
}
}
+void ResolutionErrorEntry::set_nest_host_error(const char* message) {
+ _nest_host_error = message;
+}
+
// create new error entry
ResolutionErrorEntry* ResolutionErrorTable::new_entry(int hash, ConstantPool* pool,
int cp_index, Symbol* error,
Symbol* message)
{
ResolutionErrorEntry* entry = (ResolutionErrorEntry*)Hashtable<ConstantPool*, mtClass>::new_entry(hash, pool);
entry->set_cp_index(cp_index);
entry->set_error(error);
entry->set_message(message);
+ entry->set_nest_host_error(NULL);
+
+ return entry;
+}
+
+// create new nest host error entry
+ResolutionErrorEntry* ResolutionErrorTable::new_entry(int hash, ConstantPool* pool,
+ int cp_index, const char* message)
+{
+ ResolutionErrorEntry* entry = (ResolutionErrorEntry*)Hashtable<ConstantPool*, mtClass>::new_entry(hash, pool);
+ entry->set_cp_index(cp_index);
+ entry->set_nest_host_error(message);
+ entry->set_error(NULL);
+ entry->set_message(NULL);
return entry;
}
void ResolutionErrorTable::free_entry(ResolutionErrorEntry *entry) {
// decrement error refcount
- assert(entry->error() != NULL, "error should be set");
+ if (entry->error() != NULL) {
entry->error()->decrement_refcount();
+ }
if (entry->message() != NULL) {
entry->message()->decrement_refcount();
}
+ if (entry->nest_host_error() != NULL) {
+ FREE_C_HEAP_ARRAY(char, entry->nest_host_error());
+ }
Hashtable<ConstantPool*, mtClass>::free_entry(entry);
}
// create resolution error table
< prev index next >