Skip to content

Commit 18c7922

Browse files
committedDec 5, 2023
8321224: ct.sym for JDK 22 contains references to internal modules
Reviewed-by: darcy, vromero, asotona, ihse
1 parent 83ffc1a commit 18c7922

File tree

194 files changed

+6614
-20769
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+6614
-20769
lines changed
 

‎make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java

+204-95
Large diffs are not rendered by default.

‎make/modules/jdk.compiler/Gendata.gmk

+6-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ CT_MODULES_API_TARGETS := \
4242
$(foreach m, $(CT_MODULES) $(CT_TRANSITIVE_MODULES), \
4343
$(call SetupJavaCompilationApiTarget, $m, $(JDK_OUTPUTDIR)/modules/$m))
4444

45+
#undocumented modules which should also be included in ct.sym:
46+
CT_EXTRA_MODULES := jdk.unsupported
47+
4548
SYMBOL_FILES := $(wildcard $(MODULE_SRC)/share/data/symbols/*)
4649

4750
CT_DATA_DESCRIPTION += $(MODULE_SRC)/share/data/symbols/symbols
@@ -72,6 +75,7 @@ $(SUPPORT_OUTPUTDIR)/symbols/ct.sym: $(COMPILE_CREATE_SYMBOLS) $(SYMBOL_FILES) \
7275
$(RM) -r $(@D)
7376
$(MKDIR) -p $(@D)
7477
$(ECHO) Creating ct.sym classes
78+
$(ECHO) $(CT_MODULES) $(CT_TRANSITIVE_MODULES) $(CT_EXTRA_MODULES) >$(SUPPORT_OUTPUTDIR)/symbols/included-modules
7579
$(BUILD_JAVA_SMALL) \
7680
$(COMPILECREATESYMBOLS_ADD_EXPORTS) \
7781
-classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javac \
@@ -82,7 +86,8 @@ $(SUPPORT_OUTPUTDIR)/symbols/ct.sym: $(COMPILE_CREATE_SYMBOLS) $(SYMBOL_FILES) \
8286
$(SOURCE_DATE_EPOCH) \
8387
$(JDK_SOURCE_TARGET_VERSION) \
8488
"$(VERSION_PRE)" \
85-
$(JDK_OUTPUTDIR)/modules/
89+
$(JDK_OUTPUTDIR)/modules/ \
90+
$(SUPPORT_OUTPUTDIR)/symbols/included-modules
8691
$(TOUCH) $@
8792

8893
# Copy ct.sym to the modules libs dir

0 commit comments

Comments
 (0)
Please sign in to comment.