Skip to content
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.

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

Merge lworld #340

Closed
Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
e68eac9
8259765: ZGC: Handle incorrect processor id reported by the operating…
pliden Jan 28, 2021
1926765
8253353: Crash in C2: guarantee(n != NULL) failed: No Node
Jan 28, 2021
8ffdbce
8260608: add a regression test for 8260370
iignatev Jan 29, 2021
a117e11
8260339: JVM crashes when executing PhaseIdealLoop::match_fill_loop
Jan 29, 2021
bc41bb1
8260632: Build failures after JDK-8253353
shipilev Jan 29, 2021
0fdf9cd
8260473: [vector] ZGC: VectorReshape test produces incorrect results …
casparcwang Feb 1, 2021
21f8bf4
8257215: JFR: Events dropped when streaming over a chunk rotation
egahlin Feb 1, 2021
ed1a775
8258378: Final nroff manpage update for JDK 16
magicus Feb 2, 2021
081fa3e
8260927: StringBuilder::insert is incorrect without Compact Strings
shipilev Feb 2, 2021
afd5eef
8260704: ParallelGC: oldgen expansion needs release-store for _end
Feb 2, 2021
1a7040e
8259794: Remove EA from JDK 16 version string starting with Initial R…
JesperIRL Feb 2, 2021
5307afa
8260585: AArch64: Wrong code generated for shifting right and accumul…
Feb 3, 2021
2be60e3
8257988: Remove JNF dependency from libsaproc/MacosxDebuggerLocal.m
Feb 3, 2021
f279ff9
8261010: Delete the Netbeans "default" license header
mrserb Feb 3, 2021
e2516e4
8261028: ZGC: SIGFPE when MaxVirtMemFraction=0
DamonFool Feb 4, 2021
8760688
8260616: Removing remaining JNF dependencies in the java.desktop module
Feb 4, 2021
9b7a8f1
Merge
JesperIRL Feb 4, 2021
82028e7
8260012: Reduce inclusion of collectedHeap.hpp and heapInspection.hpp
iklam Feb 4, 2021
60f440d
6436374: Graphics.setColor(null) is not documented
prsadhuk Feb 4, 2021
06b33a0
8261107: ArrayIndexOutOfBoundsException in the ICC_Profile.getInstanc…
mrserb Feb 4, 2021
e8ad8b3
8259956: jdk.jfr.internal.ChunkInputStream#available should return th…
Feb 4, 2021
992b500
8261036: Reduce classes loaded by CleanerFactory initialization
cl4es Feb 4, 2021
83357b1
8261030: Avoid loading GenerateJLIClassesHelper at runtime
cl4es Feb 4, 2021
be772ff
8261023: Document why memory pretouch must be a store
Feb 4, 2021
f7a6cff
8261149: Initial nroff manpage update for JDK 17
magicus Feb 4, 2021
c1dea39
8260335: [macos] Running app using relative path causes problems
Feb 4, 2021
4de3a6b
8260709: C2: assert(false) failed: unscheduable graph
rwestrel Feb 4, 2021
e93e1e1
8261157: Incorrect GPL header after JDK-8259956
egahlin Feb 4, 2021
bdcbfa1
8259927: Windows jpackage installer issues
Feb 4, 2021
d9aefa3
8260356: (tz) Upgrade time-zone data to tzdata2021a
Feb 4, 2021
c59e4b6
8261106: Reduce inclusion of jniHandles.hpp
iklam Feb 4, 2021
3bb6a3d
8261109: [macOS] Remove disabled warning for JNF in make/autoconf/fla…
Feb 4, 2021
08f7454
8261190: restore original Alibaba copyright line in two files
Feb 4, 2021
c5bb109
8260019: Move some Thread subtypes out of thread.hpp
iklam Feb 5, 2021
d2bd499
8163498: Many long-running security libs tests
Feb 5, 2021
1e0a101
8259862: MutableSpace's end should be atomic
Feb 5, 2021
ee2f205
8260926: Trace resource exhausted events unconditionally
tstuefe Feb 5, 2021
78b0d32
8234534: Simplify CardTable code after CMS removal
Feb 5, 2021
0791899
8261154: Memory leak in Java_java_lang_ClassLoader_defineClass0 with …
cl4es Feb 5, 2021
3495feb
8260296: SA's dumpreplaydata fails
rwestrel Feb 5, 2021
224c166
8261213: [BACKOUT] MutableSpace's end should be atomic
Feb 5, 2021
48f5220
8260369: [PPC64] Add support for JDK-8200555
TheRealMDoerr Feb 5, 2021
43ae0cf
8261167: print_process_memory_info add a close call after fopen
MBaesken Feb 5, 2021
f9df366
8242300: SystemDictionary::resolve_super_or_fail() should look for th…
coleenp Feb 5, 2021
0218917
8258732: runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTe…
calvinccheung Feb 5, 2021
4a1814c
8261179: Norwegian Bokmål Locale fallback issue
naotoj Feb 5, 2021
4a89733
8261198: [macOS] Incorrect JNI parameters in number conversion in A11…
Feb 5, 2021
7a6c176
8260736: Shenandoah: Cleanup includes in ShenandoahGC and families
zhengyu123 Feb 5, 2021
fac3c2d
8254702: jpackage app launcher crashes on CentOS
Feb 5, 2021
440db35
8216358: [accessibility] [macos] The focus is invisible when tab to "…
Feb 5, 2021
fb46d4e
8259268: Refactor InheritIO shell test as java test
Feb 6, 2021
d7acfae
Merge
JesperIRL Feb 6, 2021
74d40ab
8261200: Some code in the ICC_Profile may not close file streams prop…
mrserb Feb 6, 2021
2c3a86f
8261280: Remove THREAD argument from compute_loader_lock_object
coleenp Feb 6, 2021
7a2db85
8261022: Fix incorrect result of Math.abs() with char type
Feb 7, 2021
0e18634
8261270: MakeMethodNotCompilableTest fails with -XX:TieredStopAtLevel…
Feb 7, 2021
c5ff454
8250989: Consolidate buffer allocation code for CDS static/dynamic du…
iklam Feb 7, 2021
aa5bc6e
8258953: AArch64: move NEON instructions to aarch64_neon.ad
Feb 8, 2021
9d59dec
8248876: LoadObject with bad base address created for exec file on linux
YaSuenag Feb 8, 2021
d45343e
8260899: ARM32: SyncOnValueBasedClassTest fails with assert(is_valid(…
shipilev Feb 8, 2021
deb0544
8261251: Shenandoah: Use object size for full GC humongous compaction
rkennke Feb 8, 2021
d0a8f2f
8260593: javac can skip a temporary local variable when pattern match…
Feb 8, 2021
2c28e36
8237352: Update DatagramSocket to add support for joining multicast g…
dfuch Feb 8, 2021
db0ca2b
8261161: Clean up warnings in hotspot/jtreg/vmTestbase tests
Feb 8, 2021
dbc35f6
8261094: Open javax/swing/text/html/CSS/4765271/bug4765271.java
Feb 8, 2021
48c932e
8231286: HTML font size too large with high-DPI scaling and W3C_LENGT…
mperktold Feb 8, 2021
29a428f
8261229: MethodData is not correctly initialized with TieredStopAtLev…
Feb 8, 2021
d6d5d9b
8261231: Windows IME was disabled after DnD operation
Feb 8, 2021
351d788
8259074: regex benchmarks and tests
Feb 8, 2021
92c6e6d
8261254: Initialize charset mapping data lazily
cl4es Feb 8, 2021
20d7713
8261334: NMT: tuning statistic shows incorrect hash distribution
tstuefe Feb 8, 2021
ab65d53
8261261: The version extra fields needs to be overridable in jib-prof…
erikj79 Feb 8, 2021
ace8f94
8195744: Avoid calling ClassLoader.checkPackageAccess if security man…
coleenp Feb 8, 2021
2fd8ed0
8240632: Note differences between IEEE 754-2019 math lib special case…
jddarcy Feb 8, 2021
ad525bc
8261281: Linking jdk.jpackage fails for linux aarch32 builds after 82…
Feb 8, 2021
7451962
8129776: The optimized Stream returned from Files.lines should unmap …
Feb 8, 2021
f03e839
8261127: Cleanup THREAD/TRAPS/CHECK usage in CDS code
Feb 8, 2021
5d8204b
8261368: The new TestNullSetColor test is placed in the wrong group
mrserb Feb 9, 2021
5183d8a
8260355: AArch64: deoptimization stub should save vector registers
nick-arm Feb 9, 2021
8ebed28
8261237: remove isClassPathAttributePresent method
MBaesken Feb 9, 2021
693282f
8261393: [lworld] Adopt `primitive' as the modifier in declaration of…
Feb 9, 2021
b0e7e5a
8261263: Simplify javadoc link code
hns Feb 9, 2021
b38d5be
8261340: Fix 'deprecated' warnings in the vmTestbase/nsk tests
Feb 9, 2021
3d47537
8261439: [lworld] update use of "inline class" to "primitive class" i…
Feb 9, 2021
84c3e32
8241894: [lworld] crash in ZGC running InlineOops.java#id3
Feb 9, 2021
906faca
8260372: [PPC64] Add support for JDK-8210498 and JDK-8222841
Quaffel Feb 9, 2021
f0bd9db
8257569: Failure observed with JfrVirtualMemory::initialize
Feb 9, 2021
2f893c2
8260337: Optimize ImageReader lookup, used by Class.getResource
cl4es Feb 9, 2021
edd5fc8
8261096: Convert jlink tool to use Stream.toList()
Feb 9, 2021
8f4c15f
8198540: Dynalink leaks memory when generating type converters
szegedi Feb 9, 2021
f395ee0
8261306: ServiceLoader documentation has malformed Unicode escape
Feb 9, 2021
becee64
8261279: sun/util/resources/cldr/TimeZoneNamesTest.java timed out
naotoj Feb 9, 2021
a00b130
8261356: Clean up enum G1Mark
albertnetymk Feb 9, 2021
01d9280
8261299: Use-after-free on failure path in LinuxPackage.c, getJvmLaun…
shipilev Feb 9, 2021
7c565f8
8261209: isStandalone property: remove dependency on pretty-print
JoeWang-Java Feb 9, 2021
ef7ee3f
8225081: Remove Telia Company CA certificate expiring in April 2021
rhalade Feb 9, 2021
05c6009
8259656: fixpath.sh changes broke _NT_SYMBOL_PATH in RunTests.gmk
erikj79 Feb 9, 2021
699a3cd
8223188: Removed unnecessary #ifdef __cplusplus from .cpp sources
Feb 9, 2021
4619f37
8261472: BasicConstraintsExtension::toString shows "PathLen:214748364…
wangweij Feb 10, 2021
3af334a
6211257: BasicStroke.createStrokedShape(Shape): NPE is not specified
prsadhuk Feb 10, 2021
752f92b
6211242: AreaAveragingScaleFilter(int, int): IAE is not specified
prsadhuk Feb 10, 2021
ad54d8d
8260934: java/lang/StringBuilder/HugeCapacity.java fails without Comp…
shipilev Feb 10, 2021
a3d6e37
8261302: NMT: Improve malloc site table hashing
tstuefe Feb 10, 2021
52fc01b
8261268: LOAD_INSTANCE placeholders unneeded for parallelCapable clas…
coleenp Feb 10, 2021
a772639
8261298: LinuxPackage.c, getJvmLauncherLibPath RPM->DEB typo
shipilev Feb 10, 2021
4caeb39
8260380: Upgrade to LittleCMS 2.12
Feb 10, 2021
40754f1
4841153: java.awt.geom.Rectangle2D.add(double,double) documented inco…
prsadhuk Feb 10, 2021
cc5691c
8248162: serviceability/attach/RemovingUnixDomainSocketTest.java failed
Feb 10, 2021
447db62
6211198: ICC_Profile.getInstance(byte[]): IAE is not specified
mrserb Feb 10, 2021
adca84c
8260341: CDS dump VM init code does not check exceptions
iklam Feb 11, 2021
837bd89
8261548: ProblemList runtime/NMT/CheckForProperDetailStackTrace.java
tstuefe Feb 11, 2021
49cf13d
8261449: Micro-optimize JVM_LatestUserDefinedLoader
shipilev Feb 11, 2021
1662373
8235139: Deprecate the socket impl factory mechanism
pconcannon Feb 11, 2021
3ede231
8259430: C2: assert(in_vt->length() == out_vt->length()) failed: mism…
Feb 11, 2021
a9c3680
8261250: Dependencies: Remove unused dependency types
Feb 11, 2021
5e1b809
8261444: Remove unused fields in Lower
cl4es Feb 11, 2021
8b6ab31
8261418: Reduce decoder creation overheads for sun.nio.cs.ext Charsets
cl4es Feb 11, 2021
9fed604
8261300: jpackage: rewrite while(0)/while(false) to proper blocks
shipilev Feb 11, 2021
0a89987
8240281: Remove failing assertion code when selecting first memory st…
chhagedorn Feb 11, 2021
eef86a8
8261029: Code heap page sizes not traced correctly using os::trace_pa…
kstefanj Feb 11, 2021
4a72cea
8261509: Move per-thread StackWatermark from Thread to JavaThread class
zhengyu123 Feb 11, 2021
c342323
8261431: SA: Add comments about load address of executable
YaSuenag Feb 11, 2021
1740de2
8261297: NMT: Final report should use scale 1
tstuefe Feb 11, 2021
75c8489
8261604: ProblemList jdk/dynalink/TypeConverterFactoryMemoryLeakTest.…
Feb 11, 2021
f4cfd75
8261510: Use RFC numbers and protocol titles in sun.security.ssl.SSLE…
Feb 11, 2021
ac814ea
Merge jdk
Feb 11, 2021
bf47a47
8261282: Lazy initialization of built-in ICC_Profile/ColorSpace class…
mrserb Feb 11, 2021
60a2072
8260431: com/sun/jdi/JdbOptions.java failed with "RuntimeException: '…
Feb 11, 2021
92ff891
8261593: Do not use NULL pointer as write buffer parameter in jfrEmer…
MBaesken Feb 12, 2021
6a84ec6
8260044: Parallel GC: Concurrent allocation after heap expansion may …
Feb 12, 2021
0779add
8255059: Regressions >5% in all Javadoc benchmarks in 16-b19
hns Feb 12, 2021
da9895a
8261499: Simplify HTML for javadoc links
hns Feb 12, 2021
9c0ec8d
8260941: Remove the conc_scan parameter for CardTable
Feb 12, 2021
f1d50a1
8261633: [lworld] TestLWorld::test10 fails IR verification
TobiHartmann Feb 12, 2021
3210095
8261079: Fix support for @hidden in classes and interfaces
hns Feb 12, 2021
ebaa58d
8261505: Test test/hotspot/jtreg/gc/parallel/TestDynShrinkHeap.java k…
mychris Feb 12, 2021
4d953ff
8261631: [lworld] Fatal error in C1 compiled code due to unexpected k…
TobiHartmann Feb 12, 2021
682e78e
8261071: AArch64: Refactor interpreter native wrappers
AntonKozlov Feb 12, 2021
9e577c0
8261156: [lworld] Re-enable C1 testing after mainline issues are fixed
TobiHartmann Feb 12, 2021
9ffabf3
8252971: WindowsFileAttributes does not know about Unix domain sockets
Michael-Mc-Mahon Feb 12, 2021
40ae993
8261027: AArch64: Support for LSE atomics C++ HotSpot code
Feb 12, 2021
9f81ca8
8261230: GC tracing of page sizes are wrong in a few places
kstefanj Feb 12, 2021
59b8d59
8261481: Cannot read Kerberos settings in dynamic store on macOS Big Sur
wangweij Feb 12, 2021
b670efd
8261072: AArch64: Fix MacroAssembler::get_thread convention
AntonKozlov Feb 12, 2021
c0e805a
8261654: Missing license header in Signatures.java
hns Feb 12, 2021
6475d47
8261655: [PPC64] Build broken after JDK-8260941
TheRealMDoerr Feb 12, 2021
350303d
8260221: java.util.Formatter throws wrong exception for mismatched fl…
Feb 12, 2021
3aa1b4c
8261623: reference to javac internals in Extern class
jonathan-gibbons Feb 12, 2021
33fcd32
8261659: JDK-8261027 causes a Tier1 validate-source failure
Feb 12, 2021
6675775
8253702: BigSur version number reported as 10.16, should be 11.nn
Feb 12, 2021
28163a9
8261652: Remove some dead comments from os_bsd_x86
Feb 12, 2021
a305743
8261660: AArch64: Race condition in stub code generation for LSE Atomics
Feb 12, 2021
3dc6f52
8261160: Add a deserialization JFR event
ChrisHegarty Feb 12, 2021
06170b7
8261662: Rename compute_loader_lock_object
coleenp Feb 12, 2021
f0d9829
8261533: Java_sun_font_CFont_getCascadeList leaks memory according to…
Feb 12, 2021
dc46aa8
8261534: Test sun/security/pkcs11/KeyAgreement/IllegalPackageAccess.j…
RealCLanger Feb 12, 2021
e29c560
8247514: Improve clhsdb 'findpc' ability to determine what an address…
plummercj Feb 12, 2021
735757f
8261661: gc/stress/TestReclaimStringsLeaksMemory.java fails because R…
Feb 12, 2021
849390a
8260401: StackOverflowError on open WindowsPreferences
Feb 13, 2021
95d7312
8261585: Restore HandleArea used in Deoptimization::uncommon_trap
Feb 13, 2021
235da6a
8261672: Reduce inclusion of classLoaderData.hpp
iklam Feb 13, 2021
d9744f6
8261608: Move common CDS archive building code to archiveBuilder.cpp
iklam Feb 15, 2021
dad7d19
8261721: [lworld] Javac messages still refer to inline types
Feb 15, 2021
7c93159
8261503: Shenandoah: reconsider verifier memory ordering
shipilev Feb 15, 2021
4642730
8261496: Shenandoah: reconsider pacing updates memory ordering
shipilev Feb 15, 2021
745c0b9
8261493: Shenandoah: reconsider bitmap access memory ordering
shipilev Feb 15, 2021
df0897e
8261504: Shenandoah: reconsider ShenandoahJavaThreadsIterator::claim …
shipilev Feb 15, 2021
c6eedda
8261500: Shenandoah: reconsider region live data memory ordering
shipilev Feb 15, 2021
3882fda
8260414: Remove unused set_single_threaded_mode() method in task exec…
lkorinth Feb 15, 2021
d4ce0d4
8261647: [lworld] Missing default initialization of non-flattened fie…
TobiHartmann Feb 15, 2021
9a601e0
8261751: [lworld] Fix lingering references to inline/value types
Feb 15, 2021
2e610f5
8260687: Inherited font size is smaller than expected when using Styl…
stanio Feb 15, 2021
849f4c0
8260291: The case instruction is not visible in dark mode
Feb 15, 2021
6badd22
8261351: Create implementation for NSAccessibilityRadioButton protocol
Feb 15, 2021
34ae7ae
8261609: remove remnants of XML-driven builders
jonathan-gibbons Feb 15, 2021
e2d52ae
8261413: Shenandoah: Disable class-unloading in I-U mode
rkennke Feb 16, 2021
cdc874d
8261601: free memory in early return in Java_sun_nio_ch_sctp_SctpChan…
MBaesken Feb 16, 2021
219b115
8261422: Adjust problematic String.format calls in jdk/internal/util/…
MBaesken Feb 16, 2021
3cbd16d
8259668: Make SubTasksDone use-once
albertnetymk Feb 16, 2021
3f8819c
8261501: Shenandoah: reconsider heap statistics memory ordering
shipilev Feb 16, 2021
b9d9ca4
8255045: [lworld] LoadNode::Value() use of markWord::prototype() may …
TobiHartmann Feb 16, 2021
16bd7d3
8261336: IGV: enhance default filters
Feb 16, 2021
8ba390d
8261753: Test java/lang/System/OsVersionTest.java still failing on Bi…
RealCLanger Feb 16, 2021
3899e11
8261830: [lworld] [test] ArchiveRelocationTest compilation failure
Feb 16, 2021
6b6f794
8248223: KeyAgreement spec update on multi-party key exchange support
Feb 16, 2021
61a659f
8260415: Remove unused class ReferenceProcessorMTProcMutator
lkorinth Feb 16, 2021
0a50688
8241372: Several test failures due to javax.net.ssl.SSLException: Con…
Feb 16, 2021
55d7bbc
8261607: SA attach is exceeding JNI Local Refs capacity
plummercj Feb 16, 2021
e7e20d4
8261711: Clhsdb "versioncheck true" throws NPE every time
plummercj Feb 16, 2021
e31335f
Merge jdk
Feb 18, 2021
ba2a24b
Merge branch 'lworld' into type-restrictions_merge_lworld_17_10
MrSimms Feb 18, 2021
ba95161
inline to primitive keyword changes
MrSimms Feb 18, 2021
ccfcad5
More inline to primitive keyword changes
MrSimms Feb 18, 2021
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
@@ -189,8 +189,10 @@ ifeq ($(OPENJDK_TARGET_CPU), x86_64)
endif

ifeq ($(OPENJDK_TARGET_OS), windows)
FIXPATH := $(BASH) $(TOPDIR)/make/scripts/fixpath.sh exec
FIXPATH_BASE := $(BASH) $(TOPDIR)/make/scripts/fixpath.sh
FIXPATH := $(FIXPATH_BASE) exec
else
FIXPATH_BASE :=
FIXPATH :=
endif

@@ -273,6 +275,7 @@ $(call CreateNewSpec, $(NEW_SPEC), \
MAKE := $(MAKE), \
BASH := $(BASH), \
JIB_JAR := $(JIB_JAR), \
FIXPATH_BASE := $(FIXPATH_BASE), \
FIXPATH := $(FIXPATH), \
OPENJDK_TARGET_OS := $(OPENJDK_TARGET_OS), \
OPENJDK_TARGET_OS_TYPE := $(OPENJDK_TARGET_OS_TYPE), \
@@ -168,11 +168,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# missing-method-return-type triggers in JavaNativeFoundation framework
DISABLED_WARNINGS="$DISABLED_WARNINGS missing-method-return-type"
fi
;;
xlc)
@@ -1362,15 +1362,15 @@ var concatObjects = function (o1, o2) {
* @param patch Override patch version
* @returns {String} The numeric version string
*/
var getVersion = function (feature, interim, update, patch) {
var getVersion = function (feature, interim, update, patch, extra1, extra2, extra3) {
var version_numbers = getVersionNumbers();
var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE"))
+ "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM"))
+ "." + (update != null ? update : version_numbers.get("DEFAULT_VERSION_UPDATE"))
+ "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"))
+ "." + version_numbers.get("DEFAULT_VERSION_EXTRA1")
+ "." + version_numbers.get("DEFAULT_VERSION_EXTRA2")
+ "." + version_numbers.get("DEFAULT_VERSION_EXTRA3");
+ "." + (extra1 != null ? extra1 : version_numbers.get("DEFAULT_VERSION_EXTRA1"))
+ "." + (extra2 != null ? extra2 : version_numbers.get("DEFAULT_VERSION_EXTRA2"))
+ "." + (extra3 != null ? extra3 : version_numbers.get("DEFAULT_VERSION_EXTRA3"));
while (version.match(".*\\.0$")) {
version = version.substring(0, version.length - 2);
}

This file was deleted.

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2021, 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
@@ -49,53 +49,40 @@ public class $NAME_CLZ$ extends Charset
}

public CharsetDecoder newDecoder() {
initb2c();
return new DoubleByte.Decoder$DECTYPE$(this, b2c, b2cSB, $B2MIN$, $B2MAX$, $ASCIICOMPATIBLE$);
return new DoubleByte.Decoder$DECTYPE$(this, DecodeHolder.b2c, DecodeHolder.b2cSB, $B2MIN$, $B2MAX$, $ASCIICOMPATIBLE$);
}

public CharsetEncoder newEncoder() {
initc2b();
return new DoubleByte.Encoder$ENCTYPE$(this, $ENC_REPLACEMENT$ c2b, c2bIndex, $ASCIICOMPATIBLE$);
return new DoubleByte.Encoder$ENCTYPE$(this, $ENC_REPLACEMENT$ EncodeHolder.c2b, EncodeHolder.c2bIndex, $ASCIICOMPATIBLE$);
}

$B2C$
static char[][] b2c = new char[b2cStr.length][];
static char[] b2cSB;
private static volatile boolean b2cInitialized = false;
static class DecodeHolder {
$B2C$
static final char[][] b2c = new char[b2cStr.length][];
static final char[] b2cSB;

static void initb2c() {
if (b2cInitialized)
return;
synchronized (b2c) {
if (b2cInitialized)
return;
static {
for (int i = 0; i < b2cStr.length; i++) {
if (b2cStr[i] == null)
b2c[i] = DoubleByte.B2C_UNMAPPABLE;
else
b2c[i] = b2cStr[i].toCharArray();
}
b2cSB = b2cSBStr.toCharArray();
b2cInitialized = true;
}
}

static char[] c2b = new char[$C2BLENGTH$];
static char[] c2bIndex = new char[0x100];
private static volatile boolean c2bInitialized = false;
static class EncodeHolder {
static final char[] c2b = new char[$C2BLENGTH$];
static final char[] c2bIndex = new char[0x100];

static void initc2b() {
if (c2bInitialized)
return;
synchronized (c2b) {
if (c2bInitialized)
return;
static {
$NONROUNDTRIP_B2C$
$NONROUNDTRIP_C2B$
DoubleByte.Encoder.initC2B(b2cStr, b2cSBStr, b2cNR, c2bNR,
DoubleByte.Encoder.initC2B(DecodeHolder.b2cStr, DecodeHolder.b2cSBStr,
b2cNR, c2bNR,
$B2MIN$, $B2MAX$,
c2b, c2bIndex);
c2bInitialized = true;
}
}
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2021, 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
@@ -48,24 +48,26 @@ public class $NAME_CLZ$ extends Charset implements HistoricallyNamedCharset
}

public CharsetDecoder newDecoder() {
return new SingleByte.Decoder(this, b2c, $ASCIICOMPATIBLE$, $LATIN1DECODABLE$);
return new SingleByte.Decoder(this, Holder.b2c, $ASCIICOMPATIBLE$, $LATIN1DECODABLE$);
}

public CharsetEncoder newEncoder() {
return new SingleByte.Encoder(this, c2b, c2bIndex, $ASCIICOMPATIBLE$);
return new SingleByte.Encoder(this, Holder.c2b, Holder.c2bIndex, $ASCIICOMPATIBLE$);
}

private final static String b2cTable = $B2CTABLE$
private static class Holder {
private static final String b2cTable = $B2CTABLE$

private final static char[] b2c = b2cTable.toCharArray();
private final static char[] c2b = new char[$C2BLENGTH$];
private final static char[] c2bIndex = new char[0x100];
private static final char[] b2c = b2cTable.toCharArray();
private static final char[] c2b = new char[$C2BLENGTH$];
private static final char[] c2bIndex = new char[0x100];

static {
char[] b2cMap = b2c;
char[] c2bNR = null;
$NONROUNDTRIP_B2C$
$NONROUNDTRIP_C2B$
SingleByte.initC2B(b2cMap, c2bNR, c2b, c2bIndex);
static {
char[] b2cMap = b2c;
char[] c2bNR = null;
$NONROUNDTRIP_B2C$
$NONROUNDTRIP_C2B$
SingleByte.initC2B(b2cMap, c2bNR, c2b, c2bIndex);
}
}
}
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2020f
tzdata2021a
@@ -1550,11 +1550,17 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931
3:00 - EAT 2017 Nov 1
2:00 - CAT

# From Steffen Thorsen (2021-01-18):
# "South Sudan will change its time zone by setting the clock back 1
# hour on February 1, 2021...."
# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/

# South Sudan
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Juba 2:06:28 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00
3:00 - EAT
3:00 - EAT 2021 Feb 1 00:00
2:00 - CAT

# Tanzania
# See Africa/Nairobi.
@@ -95,11 +95,11 @@ Leap 2016 Dec 31 23:59:60 + S
# Any additional leap seconds will come after this.
# This Expires line is commented out for now,
# so that pre-2020a zic implementations do not reject this file.
#Expires 2021 Jun 28 00:00:00
#Expires 2021 Dec 28 00:00:00

# POSIX timestamps for the data in this file:
#updated 1467936000 (2016-07-08 00:00:00 UTC)
#expires 1624838400 (2021-06-28 00:00:00 UTC)
#expires 1640649600 (2021-12-28 00:00:00 UTC)

# Updated through IERS Bulletin C60
# File expires on: 28 June 2021
# Updated through IERS Bulletin C61
# File expires on: 28 December 2021
@@ -96,8 +96,6 @@ $(BUILD_LIBNIO): $(BUILD_LIBNET)
# Create the macosx security library

ifeq ($(call isTargetOs, macosx), true)
# JavaNativeFoundation framework not supported in static builds
ifneq ($(STATIC_BUILD), true)

$(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \
NAME := osxsecurity, \
@@ -120,7 +118,6 @@ ifeq ($(call isTargetOs, macosx), true)

TARGETS += $(BUILD_LIBOSXSECURITY)

endif
endif

################################################################################
@@ -101,7 +101,6 @@ ifeq ($(call isTargetOs, macosx), true)
-framework Cocoa \
-framework Security \
-framework ExceptionHandling \
-framework JavaNativeFoundation \
-framework JavaRuntimeSupport \
-framework OpenGL \
-framework IOSurface \
@@ -127,7 +126,6 @@ ifeq ($(call isTargetOs, macosx), true)
-losxapp \
-framework Cocoa \
-framework ApplicationServices \
-framework JavaNativeFoundation \
-framework JavaRuntimeSupport \
-framework SystemConfiguration \
$(JDKLIB_LIBS), \
@@ -160,7 +160,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
LIBS_macosx := -lmlib_image \
-framework Cocoa \
-framework OpenGL \
-framework JavaNativeFoundation \
-framework JavaRuntimeSupport \
-framework ApplicationServices \
-framework AudioToolbox, \
@@ -767,8 +766,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
-framework ApplicationServices \
-framework Foundation \
-framework Security \
-framework Cocoa \
-framework JavaNativeFoundation
-framework Cocoa
else ifeq ($(call isTargetOs, windows), true)
LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
else
@@ -866,7 +864,6 @@ ifeq ($(call isTargetOs, macosx), true)
-framework Cocoa \
-framework Security \
-framework ExceptionHandling \
-framework JavaNativeFoundation \
-framework JavaRuntimeSupport \
-framework OpenGL \
-framework QuartzCore -ljava, \
@@ -904,7 +901,6 @@ ifeq ($(call isTargetOs, macosx), true)
-framework Cocoa \
-framework Carbon \
-framework ApplicationServices \
-framework JavaNativeFoundation \
-framework JavaRuntimeSupport \
-ljava -ljvm, \
))
@@ -69,7 +69,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
LIBS := $(LIBCXX), \
LIBS_unix := -ljava, \
LIBS_linux := $(LIBDL), \
LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
LIBS_macosx := -framework Foundation \
-framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \
))