Skip to content

8311661: Resolve duplicate symbol of StringTable::StringTable with JDK static linking #14808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

8311661: Resolve duplicate symbol of StringTable::StringTable with JDK static linking #14808

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb9cd38
8311661: Resolve duplicate symbol of StringTable::StringTable with JD…
jianglizhou Jul 7, 2023
cb9a4a2
Move '} // namespace JavaClassFile' to after '#endif //INCLUDE_CDS_J…
jianglizhou Jul 7, 2023
c31ad97
Merge branch 'master' into JDK-8311661
jianglizhou Jul 10, 2023
3ede61d
- Change to use a hotspot global namespace, based on the discussions …
jianglizhou Jul 12, 2023
3385b74
Merge branch 'master' into JDK-8311661
jianglizhou Jul 12, 2023
db681ec
Add hotspot_jvm:: to StringTable in javaClasses.hpp.
jianglizhou Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/hotspot/share/classfile/javaClasses.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#ifndef SHARE_CLASSFILE_JAVACLASSES_HPP
#define SHARE_CLASSFILE_JAVACLASSES_HPP

#include "classfile/stringTable.hpp"
#include "classfile/vmClasses.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/oopsHierarchy.hpp"
Expand Down Expand Up @@ -197,7 +198,7 @@ class java_lang_String : AllStatic {
// Debugging
static void print(oop java_string, outputStream* st);
friend class JavaClasses;
friend class StringTable;
friend class hotspot_jvm::StringTable;
};


Expand Down