--- old/src/hotspot/share/classfile/resolutionErrors.hpp 2020-03-26 15:58:00.000000000 -0700 +++ new/src/hotspot/share/classfile/resolutionErrors.hpp 2020-03-26 15:57:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, 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 @@ -46,6 +46,8 @@ ResolutionErrorEntry* new_entry(int hash, ConstantPool* pool, int cp_index, Symbol* error, Symbol* message); + ResolutionErrorEntry* new_entry(int hash, ConstantPool* pool, int cp_index, + const char* message); void free_entry(ResolutionErrorEntry *entry); ResolutionErrorEntry* bucket(int i) { @@ -64,6 +66,8 @@ void add_entry(int index, unsigned int hash, const constantPoolHandle& pool, int which, Symbol* error, Symbol* message); + void add_entry(int index, unsigned int hash, + const constantPoolHandle& pool, int which, const char* message); // find error given the constant pool and constant pool index ResolutionErrorEntry* find_entry(int index, unsigned int hash, @@ -95,6 +99,7 @@ int _cp_index; Symbol* _error; Symbol* _message; + const char* _nest_host_error; public: ConstantPool* pool() const { return literal(); } @@ -108,6 +113,9 @@ Symbol* message() const { return _message; } void set_message(Symbol* c); + const char* nest_host_error() const { return _nest_host_error; } + void set_nest_host_error(const char* message); + ResolutionErrorEntry* next() const { return (ResolutionErrorEntry*)HashtableEntry::next(); }