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 jdk #175

Closed
wants to merge 75 commits into from
Closed

Merge jdk #175

Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
18d5626
8250929: Missing "classpath exception" in LambdaProxyClassArchive.java
Aug 5, 2020
44c6537
Added tag jdk-15+35 for changeset fd60c3146a02
vidmik Aug 6, 2020
deaadfa
8247938: Change various JVM enums like LinkInfo::AccessCheck and Klas…
Aug 6, 2020
9886b7e
8248879: SA core file support on OSX has some bugs trying to locate t…
plummercj Aug 6, 2020
c02b757
8161684: [testconf] Add VerifyOops' testing into compiler tiers
lmesnik Aug 6, 2020
111ba18
8249550: jdb should use loopback address when not using remote agent
Aug 6, 2020
c202bd7
8250606: Remove unnecessary assertions in ObjectSynchronizer FastHash…
Aug 7, 2020
db46b29
8251121: six SA tests leave core files behind on macOS
plummercj Aug 7, 2020
d02e7d5
8251272: Typo in java.util.Formatter: "Numberic" should be "Numeric"
Aug 7, 2020
70885ca
Merge
Aug 7, 2020
764b50a
8248299: two jdeps files miss copyright header
sundararajana Aug 7, 2020
ef86f06
8250665: Wrong translation for the month name of May in ar_JO,LB,SY
Aug 7, 2020
12879e9
8250928: JFR: Improve hash algorithm for stack traces
gabrielreid Aug 7, 2020
555f0e6
Added tag jdk-16+10 for changeset b01985b4f88f
vidmik Aug 7, 2020
c148c2c
8165404: AArch64: Implement SHA512 accelerator/intrinsic
dgbo Aug 7, 2020
4d3baa2
8251179: Word tearing problem with _last_sweep
Aug 7, 2020
0c9e0c2
8244997: Convert the JavaThread::_threadObj oop to use OopStorage
coleenp Aug 7, 2020
45c89da
8249786: java/net/httpclient/websocket/PendingPingTextClose.java fail…
dfuch Aug 7, 2020
77c46ea
8229822: ThrowingPushPromises tests sometimes fail due to EOF
dfuch Aug 7, 2020
e800cc2
8251184: File association without description causes exception
Aug 7, 2020
1ad1659
8251260: two MD5 tests fail "RuntimeException: Unexpected count of in…
Aug 7, 2020
9852a6f
8248401: Refactor/unify RMI gc support functionality
Aug 7, 2020
c8c4d83
8250886: java/net/DatagramSocket/SendReceiveMaxSize.java fails in tim…
pconcannon Aug 7, 2020
4ac45a3
8245036: DataInputStream.readFully(byte[], int, int) does not throw e…
rgiulietti Aug 7, 2020
3c276ce
8067651: LevelTransitionTest.java, fix trivial methods levels logic
Jul 27, 2020
084e15b
8248905: [macos] symbolic links not properly resolved
Aug 8, 2020
f70fc14
8251276: JDK-8248299 breaks JDK 15 validate-headers build
sundararajana Aug 8, 2020
3ed5683
8248830: C2: Optimize Rotate API on x86
Aug 8, 2020
b5d775f
8248745: Add jarsigner and keytool tests for restricted algorithms
Aug 9, 2020
6df465d
8251257: NMT: jcmd VM.native_memory scale=1 crashes target VM
tstuefe Aug 9, 2020
ee060c7
8241951: SA core file tests failed to find core file for signed binar…
plummercj Aug 10, 2020
c1093dc
8251213: [TESTBUG] CDS tests shouldn't write output files into test.c…
iklam Aug 10, 2020
970e251
8249608: Vector register used by C2 compiled method corrupted at safe…
TobiHartmann Aug 10, 2020
032a4d6
8241007: Shenandoah: remove ShenandoahCriticalControlThreadPriority s…
Aug 10, 2020
660272c
8241574: Shenandoah: remove ShenandoahAssertToSpaceClosure
Aug 10, 2020
1d480a7
8250636: iso8601_time returns incorrect offset part on MacOS
Aug 10, 2020
7332181
8251303: C2: remove unused _site_invoke_ratio and related code from I…
Aug 10, 2020
c2fa441
8250521: Configure initial RTO to use minimal retry for loopback conn…
Aug 10, 2020
c57d89a
8251255: [linux] Add process-memory information to hs-err and VM.info
tstuefe Aug 10, 2020
b35a3bd
8251322: Improve BitMap::iterate
Aug 10, 2020
8e68745
8248006: Revisit exceptions thrown when creating an HttpClient fails …
rhyadav Aug 10, 2020
55e381b
8247605: Avoid array allocation when concatenating with empty string
Aug 10, 2020
db1e207
8249703: test/jdk/java/io/File/GetXSpace.java fails on macos
Aug 10, 2020
b5f785b
8246816: XMLGregorianCalendar.hashCode() produces far too many identi…
JoeWang-Java Aug 10, 2020
d0d925c
8251017: java/io/File/GetXSpace.java fails on UNIX
Aug 10, 2020
688e5d9
Merge
Aug 10, 2020
ed5696d
8251361: Potential race between Logger configuration and GCs in HttpU…
Aug 10, 2020
1cc09cc
8251117: Cannot check P11Key size in P11Cipher and P11AEADCipher
zzambers Aug 4, 2020
5e9702d
8250876: Fix issues with cross-compile on macos
Aug 10, 2020
e64a25b
8246347: [JVMCI] Set is_method_handle_invoke flag accordingly when de…
Aug 10, 2020
6cfe3fe
Merge
Aug 10, 2020
092389e
8249749: modify a primitive array through a stream and a for cycle ca…
Aug 10, 2020
b83ea8b
8251369: [JVMCI] Backout 8246347 changes
Aug 10, 2020
91926e2
Merge
vidmik Aug 11, 2020
23ed3a9
8250808: Re-associate loop invariants with other associative operations
Aug 11, 2020
315ae4c
8250954: Avoid multiple warnings for external docs with mismatching m…
hns Aug 11, 2020
28f963f
8251365: Build failure on AIX after 8250636
Aug 11, 2020
b16a01b
8251302: Create dedicated OopStorages for Management and Jvmti
coleenp Aug 11, 2020
d6bd183
8251399: JDK-8248701 had incorrect indentation
magicus Aug 11, 2020
5d2f6e7
8250848: [aarch64] nativeGotJump_at() missing call to verify()
Aug 10, 2020
7ca448b
8251359: Shenandoah: filter null oops before calling enqueue/SATB bar…
zhengyu123 Aug 11, 2020
dc8026d
8251205: Add missing javadoc comments to ZipConstants.java
Aug 11, 2020
832d896
8251268: Move PhaseChaitin definitions from live.cpp to chaitin.cpp
cliveverghese Aug 11, 2020
fe5817a
8251383: Disable Event::log from linux_mprotect when processing the a…
Aug 12, 2020
a5ae1e3
8251306: compiler/aot/cli/jaotc/IgnoreErrorsTest.java timed out on MacOS
Aug 12, 2020
178eea6
8249276: CDS archived objects must have "neutral" markwords
iklam Aug 12, 2020
9885ac1
8249603: C1: assert(has_error == false) failed: register allocation i…
chhagedorn Aug 12, 2020
d502554
8250772: Test com/sun/jndi/ldap/NamingExceptionMessageTest.java fails…
AlekseiEfimov Aug 12, 2020
6a52038
8251189: com/sun/jndi/ldap/LdapDnsProviderTest.java failed due to tim…
AlekseiEfimov Aug 12, 2020
c540da3
8251451: Shenandoah: Remark ObjectSynchronizer roots with I-U
rkennke Aug 12, 2020
831f23e
8246707: (sc) SocketChannel.read/write throws AsynchronousCloseExcept…
c-cleary Aug 12, 2020
7f0777a
8251336: OopHandle release can not be called in a safepoint
coleenp Aug 12, 2020
c55e52e
8241053: Hotspot runtime/CommandLine/OptionsValidation/TestOptionsWit…
Aug 12, 2020
ee2e61d
8232621: L10n issues with msi installers
Aug 12, 2020
3da2824
Merge tag 'jdk-16+11' into lworld_merge_jdk_16_11
MrSimms Sep 2, 2020
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -660,4 +660,6 @@ a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31
c3a4a7ea7c304cabdacdc31741eb94c51351668d jdk-16+7
b0817631d2f4395508cb10e81c3858a94d9ae4de jdk-15+34
0a73d6f3aab48ff6d7e61e47f0bc2d87a054f217 jdk-16+8
fd60c3146a024037cdd9be34c645bb793995a7cc jdk-15+35
c075a286cc7df767cce28e8057d6ec5051786490 jdk-16+9
b01985b4f88f554f97901e53e1ba314681dd9c19 jdk-16+10
@@ -218,10 +218,12 @@ AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
# We also need -iframework<path>/System/Library/Frameworks
$1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks"
$1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks"
# These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
# set this here so it doesn't have to be peppered throughout the forest
$1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
$1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
if test -d "[$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" ; then
# These always need to be set on macOS 10.X, or we can't find the frameworks embedded in JavaVM.framework
# set this here so it doesn't have to be peppered throughout the forest
$1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
$1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
fi
fi
AC_SUBST($1SYSROOT_CFLAGS)
@@ -902,9 +902,14 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
# FIXME: we should list the discovered compilers as an exclude pattern!
# If we do that, we can do this detection before POST_DETECTION, and still
# find the build compilers in the tools dir, if needed.
UTIL_REQUIRE_PROGS(BUILD_CC, [cl cc gcc])
if test "x$OPENJDK_BUILD_OS" = xmacosx; then
UTIL_REQUIRE_PROGS(BUILD_CC, [clang cl cc gcc])
UTIL_REQUIRE_PROGS(BUILD_CXX, [clang++ cl CC g++])
else
UTIL_REQUIRE_PROGS(BUILD_CC, [cl cc gcc])
UTIL_REQUIRE_PROGS(BUILD_CXX, [cl CC g++])
fi
UTIL_FIXUP_EXECUTABLE(BUILD_CC)
UTIL_REQUIRE_PROGS(BUILD_CXX, [cl CC g++])
UTIL_FIXUP_EXECUTABLE(BUILD_CXX)
UTIL_PATH_PROGS(BUILD_NM, nm gcc-nm)
UTIL_FIXUP_EXECUTABLE(BUILD_NM)
@@ -346,7 +346,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
sub(/\/\*.*\*\//, ""); \
gsub(/^ +\*.*/, ""); \
gsub(/ /, ""); \
gsub(/\r/, ""); \
gsub(/\r/, ""); \
printf(" %s", $$0) } \
END { printf("\n") }' $m && \
$(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
@@ -360,7 +360,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
sub(/\/\*.*\*\//, ""); \
gsub(/^ +\*.*/, ""); \
gsub(/ /, ""); \
gsub(/\r/, ""); \
gsub(/\r/, ""); \
printf(" %s", $$0) } \
END { printf("\n") }' $m \
) >> $@ $(NEWLINE))
@@ -865,6 +865,37 @@ def astr(self):
def aname(self):
return self._name

class SHA512SIMDOp(Instruction):

def generate(self):
if (self._name == 'sha512su0'):
self.reg = [FloatRegister().generate(), FloatRegister().generate()]
else:
self.reg = [FloatRegister().generate(), FloatRegister().generate(),
FloatRegister().generate()]
return self

def cstr(self):
if (self._name == 'sha512su0'):
return (super(SHA512SIMDOp, self).cstr()
+ ('%s, __ T2D, %s);' % (self.reg[0], self.reg[1])))
else:
return (super(SHA512SIMDOp, self).cstr()
+ ('%s, __ T2D, %s, %s);' % (self.reg[0], self.reg[1], self.reg[2])))

def astr(self):
if (self._name == 'sha512su0'):
return (super(SHA512SIMDOp, self).astr()
+ ('\t%s.2D, %s.2D' % (self.reg[0].astr("v"), self.reg[1].astr("v"))))
elif (self._name == 'sha512su1'):
return (super(SHA512SIMDOp, self).astr()
+ ('\t%s.2D, %s.2D, %s.2D' % (self.reg[0].astr("v"),
self.reg[1].astr("v"), self.reg[2].astr("v"))))
else:
return (super(SHA512SIMDOp, self).astr()
+ ('\t%s, %s, %s.2D' % (self.reg[0].astr("q"),
self.reg[1].astr("q"), self.reg[2].astr("v"))))

class LSEOp(Instruction):
def __init__(self, args):
self._name, self.asmname, self.size, self.suffix = args
@@ -1100,6 +1131,8 @@ def generate(kind, names):
["ld4r", 4, "2S", Address.post_reg],
])

generate(SHA512SIMDOp, ["sha512h", "sha512h2", "sha512su0", "sha512su1"])

generate(SpecialCases, [["ccmn", "__ ccmn(zr, zr, 3u, Assembler::LE);", "ccmn\txzr, xzr, #3, LE"],
["ccmnw", "__ ccmnw(zr, zr, 5u, Assembler::EQ);", "ccmn\twzr, wzr, #5, EQ"],
["ccmp", "__ ccmp(zr, 1, 4u, Assembler::NE);", "ccmp\txzr, 1, #4, NE"],
@@ -1147,8 +1180,8 @@ def generate(kind, names):
import subprocess
import sys

# compile for 8.1 because of lse atomics
subprocess.check_call([AARCH64_AS, "-march=armv8.1-a", "aarch64ops.s", "-o", "aarch64ops.o"])
# compile for 8.1 and sha2 because of lse atomics and sha512 crypto extension.
subprocess.check_call([AARCH64_AS, "-march=armv8.1-a+sha2", "aarch64ops.s", "-o", "aarch64ops.o"])

print
print "/*",