From bugzilla-daemon at icedtea.classpath.org Wed Jun 6 02:34:18 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jun 2018 02:34:18 +0000 Subject: [Bug 3516] [TRACKER] IcedTea 3.8.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3516 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #1 from Andrew John Hughes --- Released: http://bitly.com/it30800 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 6 02:35:00 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jun 2018 02:35:00 +0000 Subject: [Bug 3581] [TRACKER] IcedTea 3.9.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3581 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |656 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 6 02:35:00 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 06 Jun 2018 02:35:00 +0000 Subject: [Bug 3516] [TRACKER] IcedTea 3.8.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3516 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|656 | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sun Jun 10 16:31:48 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 10 Jun 2018 16:31:48 +0000 Subject: [Bug 3533] [IcedTea8] HotSpot generates code with unaligned stack, crashes on SSE operations In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3533 --- Comment #36 from Maciej S. Szmigiero --- I have dug out the i386 setup where the problem is present and tried to build icedtea-3.8.0 there and well... it crashed at a SSE operation as usual. Specifically the JVM entry function that is missing the stack realignment code is InterpreterRuntime::resolve_invoke(JavaThread*, Bytecodes::Code) from interpreterRuntime.cpp: #0 0xf7d72232 in pthread_cond_wait () from /lib/libpthread.so.0 #1 0xf7547e8f in os::PlatformEvent::park (this=0xa3f8dc00) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/os/linux/vm/os_linux.cpp:5860 #2 0xf752fa07 in ObjectMonitor::wait (this=0xa3c014c4, millis=0, interruptible=interruptible at entry=false, __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/objectMonitor.cpp:1555 #3 0xf764d0cd in ObjectSynchronizer::waitUninterruptibly (obj=..., millis=0, __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/synchronizer.cpp:406 #4 0xf72be6b2 in ObjectLocker::waitUninterruptibly (__the_thread__=0xa3f8d400, this=0xa3efec90) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/synchronizer.hpp:161 #5 InstanceKlass::initialize_impl (this_oop=this_oop at entry=..., __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/oops/instanceKlass.cpp:851 #6 0xf72bee5d in InstanceKlass::initialize (this=0xa42d8340, __the_thread__=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/oops/instanceKlass.cpp:569 #7 0xf7430fb1 in LinkResolver::resolve_static_call (result=..., resolved_klass=..., method_name=0xa6c380f8, method_signature=0xa6c286e8, current_klass=..., check_access=check_access at entry=true, initialize_class=initialize_class at entry=true, __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/interpreter/linkResolver.cpp:868 #8 0xf74314b5 in LinkResolver::resolve_invokestatic (result=..., pool=..., index=index at entry=7, __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/interpreter/linkResolver.cpp:1532 #9 0xf7432601 in LinkResolver::resolve_invoke (result=..., recv=..., pool=..., index=index at entry=7, byte=byte at entry=Bytecodes::_invokestatic, __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/interpreter/linkResolver.cpp:1504 #10 0xf72ed216 in InterpreterRuntime::resolve_invoke (thread=0xa3f8d400, bytecode=Bytecodes::_invokestatic) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp:719 #11 0xe78e7b5f in ?? () #12 0xe78d0499 in ?? () #13 0xf72f67db in JavaCalls::call_helper (result=0xa3eff244, m=0xa3eff13c, args=0xa3eff1b8, __the_thread__=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/javaCalls.cpp:397 #14 0xf72f418f in JavaCalls::call (__the_thread__=0xa3f8d400, args=0xa3eff1b8, method=..., result=0xa3eff244) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/javaCalls.cpp:307 #15 JavaCalls::call_virtual (result=result at entry=0xa3eff244, spec_klass=..., spec_klass at entry=..., name=name at entry=0xa6c26470, signature=signature at entry=0xa6c27b30, args=args at entry=0xa3eff1b8, __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/javaCalls.cpp:204 #16 0xf72f46a4 in JavaCalls::call_virtual (result=result at entry=0xa3eff244, receiver=..., spec_klass=..., name=0xa6c26470, signature=0xa6c27b30, __the_thread__=__the_thread__ at entry=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/javaCalls.cpp:210 #17 0xf7343567 in thread_entry (thread=0xa3f8d400, __the_thread__=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/prims/jvm.cpp:3014 #18 0xf768b40e in JavaThread::thread_main_inner (this=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/runtime/thread.cpp:1699 #19 0xf7542c1a in java_start (thread=0xa3f8d400) at /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/os/linux/vm/os_linux.cpp:794 #20 0xf7d6a9fc in start_thread () from /lib/libpthread.so.0 #21 0xf7ebdd06 in clone () from /lib/libc.so.6 Disassembly of this function confirms that the stack realignment code is missing: Dump of assembler code for function InterpreterRuntime::resolve_invoke(JavaThread*, Bytecodes::Code): 0xf72ecf00 <+0>: push %ebp 0xf72ecf01 <+1>: mov %esp,%ebp 0xf72ecf03 <+3>: push %edi 0xf72ecf04 <+4>: push %esi 0xf72ecf05 <+5>: push %ebx 0xf72ecf06 <+6>: sub $0x10dc,%esp 0xf72ecf0c <+12>: orl $0x0,(%esp) 0xf72ecf10 <+16>: add $0x1010,%esp 0xf72ecf16 <+22>: xor %edx,%edx 0xf72ecf18 <+24>: call 0xf6e36ea1 <__x86.get_pc_thunk.ax> Note the lack of a AND operation on the stack pointer. The interpreterRuntime.cpp file does actually get compiled with "-mstackrealign" as it is supposed to: /usr/bin/g++ -DLINUX -D_GNU_SOURCE -DIA32 -DPRODUCT -I/var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/prims -I/var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm -I/var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/precompiled -I/var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/cpu/x86/vm -I/var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/os_cpu/linux_x86/vm -I/var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/os/linux/vm -I/var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"25.171-b11\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"portage\"" -DHOTSPOT_LIB_ARCH=\"i386\" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea 3.8.0\"" -DDISTRIBUTION_ID="\"NAME=Gentoo, package Gentoo icedtea-3.8.0\"" -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_32 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_32 -DTARGET_COMPILER_gcc -DCOMPILER2 -DCOMPILER1 -DDONT_USE_PRECOMPILED_HEADER -fPIC -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m32 -march=i586 -pipe -fno-strict-aliasing -g -fno-omit-frame-pointer -O3 -DVM_LITTLE_ENDIAN -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type -O2 -march=pentium-m -pipe -fno-delete-null-pointer-checks -fno-lifetime-dse -std=gnu++98 -mstackrealign -DDTRACE_ENABLED -c -MMD -MP -MF ../generated/dependencies/interpreterRuntime.o.d -fpch-deps -o interpreterRuntime.o /var/tmp/portage/dev-java/icedtea-3.8.0/work/icedtea-3.8.0/openjdk-boot/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp If I add "-mincoming-stack-boundary=2" to compiler flags the generated code looks like this instead: 0000af90 : af90: 55 push %ebp af91: 89 e5 mov %esp,%ebp af93: 57 push %edi af94: 56 push %esi af95: 53 push %ebx af96: 83 e4 f0 and $0xfffffff0,%esp af99: 81 ec d0 10 00 00 sub $0x10d0,%esp af9f: 83 0c 24 00 orl $0x0,(%esp) afa3: 81 c4 10 10 00 00 add $0x1010,%esp afa9: e8 fc ff ff ff call afaa Notice the added AND operation on the stack pointer. Unsurprisingly, after adding this flag back IcedTea is able to build successfully. Once again I would like to ask you to try compiling the simple example from comment 23 with "-mstackrealign" only. If the compiler version you are using adds the stack realigning instruction in that case that would explain the difference we are seeing. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 01:36:19 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 01:36:19 +0000 Subject: [Bug 3599] New: [IcedTea8] Debug build broken by addition of -Wreturn-type (bug 3548) Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3599 Bug ID: 3599 Summary: [IcedTea8] Debug build broken by addition of -Wreturn-type (bug 3548) Product: IcedTea Version: 3.x-hg Hardware: all OS: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org /home/andrew/projects/openjdk/upstream/icedtea8/hotspot/src/share/vm/opto/compile.cpp: In member function 'void Compile::verify_graph_edges(bool)': /home/andrew/projects/openjdk/upstream/icedtea8/hotspot/src/share/vm/opto/compile.cpp:3530:25: error: use of an operand of type 'bool' in 'operator++' is deprecated [-Werror=deprecated] if (dead_nodes++ == 0) ^~ -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 01:37:08 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 01:37:08 +0000 Subject: [Bug 3581] [TRACKER] IcedTea 3.9.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3581 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |3599 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 01:37:08 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 01:37:08 +0000 Subject: [Bug 3548] [IcedTea8] Backport "8062808: Turn on the -Wreturn-type warning" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3548 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |3599 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 01:37:08 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 01:37:08 +0000 Subject: [Bug 3599] [IcedTea8] Debug build broken by addition of -Wreturn-type (bug 3548) In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3599 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |3581 Depends on| |3548 Target Milestone|--- |3.9.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 02:23:31 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 02:23:31 +0000 Subject: [Bug 3600] New: [IcedTea8] jni_util.c does not import header file which declares getLastErrorString Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3600 Bug ID: 3600 Summary: [IcedTea8] jni_util.c does not import header file which declares getLastErrorString Product: IcedTea Version: 3.x-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org /home/andrew/projects/openjdk/upstream/icedtea8/jdk/src/share/native/common/jni_util.c: In function 'JNU_ThrowByNameWithMessageAndLastError': /home/andrew/projects/openjdk/upstream/icedtea8/jdk/src/share/native/common/jni_util.c:160:16: error: implicit declaration of fu nction 'getLastErrorString'; did you mean 'getErrorString'? [-Werror=implicit-function-declaration] size_t n = getLastErrorString(buf, sizeof(buf)); ^~~~~~~~~~~~~~~~~~ getErrorString getLastErrorString is declared in io_util.h which isn't included by jni_util.c -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 02:23:48 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 02:23:48 +0000 Subject: [Bug 3581] [TRACKER] IcedTea 3.9.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3581 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |3600 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 02:23:48 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 02:23:48 +0000 Subject: [Bug 3600] [IcedTea8] jni_util.c does not import header file which declares getLastErrorString In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3600 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |3581 Target Milestone|--- |3.9.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 03:16:34 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 03:16:34 +0000 Subject: [Bug 3601] New: [IcedTea8] Debug build broken by addition of -Wreturn-type (bug 3548) Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3601 Bug ID: 3601 Summary: [IcedTea8] Debug build broken by addition of -Wreturn-type (bug 3548) Product: IcedTea Version: 3.x-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org /builddir/build/BUILD/java-1.8.0-openjdk-1.8.0.172-7.b11.el7.x86_64/openjdk/hotspot/src/share/vm/prims/jvm.cpp: In function 'jboolean JVM_KnownToNotExist(JNIEnv*, jobject, const char*)': /builddir/build/BUILD/java-1.8.0-openjdk-1.8.0.172-7.b11.el7.x86_64/openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp:595:17: error: control reaches end of non-void function [-Werror=return-type] #define JVM_END } } ^ /builddir/build/BUILD/java-1.8.0-openjdk-1.8.0.172-7.b11.el7.x86_64/openjdk/hotspot/src/share/vm/prims/jvm.cpp:842:1: note: in expansion of macro 'JVM_END' JVM_END ^ /builddir/build/BUILD/java-1.8.0-openjdk-1.8.0.172-7.b11.el7.x86_64/openjdk/hotspot/src/share/vm/prims/jvm.cpp: In function '_jobjectArray* JVM_GetResourceLookupCacheURLs(JNIEnv*, jobject)': /builddir/build/BUILD/java-1.8.0-openjdk-1.8.0.172-7.b11.el7.x86_64/openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp:595:17: error: control reaches end of non-void function [-Werror=return-type] #define JVM_END } } ^ /builddir/build/BUILD/java-1.8.0-openjdk-1.8.0.172-7.b11.el7.x86_64/openjdk/hotspot/src/share/vm/prims/jvm.cpp:852:1: note: in expansion of macro 'JVM_END' etc. 8064786 fixes some cases, but not all. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 03:16:53 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 03:16:53 +0000 Subject: [Bug 3601] [IcedTea8] Debug build broken by addition of -Wreturn-type (bug 3548) In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3601 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |3581 Target Milestone|--- |3.9.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 03:16:53 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 03:16:53 +0000 Subject: [Bug 3581] [TRACKER] IcedTea 3.9.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3581 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |3601 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 03:17:27 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 03:17:27 +0000 Subject: [Bug 3599] [IcedTea8] Debug build broken on GCC 7 In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3599 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|3548 | Summary|[IcedTea8] Debug build |[IcedTea8] Debug build |broken by addition of |broken on GCC 7 |-Wreturn-type (bug 3548) | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 03:17:27 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 03:17:27 +0000 Subject: [Bug 3548] [IcedTea8] Backport "8062808: Turn on the -Wreturn-type warning" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3548 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|3599 | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 03:17:33 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 03:17:33 +0000 Subject: [Bug 3601] [IcedTea8] Debug build broken by addition of -Wreturn-type (bug 3548) In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3601 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |3548 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Jun 19 03:17:33 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 19 Jun 2018 03:17:33 +0000 Subject: [Bug 3548] [IcedTea8] Backport "8062808: Turn on the -Wreturn-type warning" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3548 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |3601 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jvanek at icedtea.classpath.org Wed Jun 20 11:37:55 2018 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 20 Jun 2018 11:37:55 +0000 Subject: /hg/icedtea-web: 3 new changesets Message-ID: changeset 2feb6baf653e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2feb6baf653e author: Jiri Vanek date: Wed Jun 20 12:46:34 2018 +0200 Added semi support for recognition jdk10 and up * netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java: replaced hardcoded 9 by cycle from 9 to 99 * netx/net/sourceforge/jnlp/resources/Messages.properties: replaced jdk9 by jdk9 and up. changeset 4bac53123926 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4bac53123926 author: Jiri Vanek date: Wed Jun 20 13:00:13 2018 +0200 netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: fixed hex output of certificate signature for jdk8 changeset 2d74ab38dd55 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2d74ab38dd55 author: Jiri Vanek date: Wed Jun 20 13:36:32 2018 +0200 Enhanced itw-settngs' certificate viewer to show what file is backing showed certificate store. * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: adapted to refactoring of KeyStores * netx/net/sourceforge/jnlp/security/KeyStores.java: getKeyStore now returns wrapper with path alongside with ks itself * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: adapted to refactoring of KeyStores * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java: now shows read-only path to shown ks diffstat: ChangeLog | 19 +++ netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java | 9 +- netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +- netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 +- netx/net/sourceforge/jnlp/security/KeyStores.java | 60 ++++++--- netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java | 2 +- netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java | 27 ++-- netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 43 +++++-- 8 files changed, 113 insertions(+), 51 deletions(-) diffs (428 lines): diff -r 348532e210c0 -r 2d74ab38dd55 ChangeLog --- a/ChangeLog Mon May 28 12:29:35 2018 +0200 +++ b/ChangeLog Wed Jun 20 13:36:32 2018 +0200 @@ -1,3 +1,22 @@ +2018-06-20 Jiri Vanek + + Enhanced itw-settngs' certificate viewer to show what file is backing showed certificate store. + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: adapted to refactoring of KeyStores + * netx/net/sourceforge/jnlp/security/KeyStores.java: getKeyStore now returns wrapper with path alongside with ks itself + * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: adapted to refactoring of KeyStores + * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java: now shows read-only path to shown ks + +2018-06-20 Jiri Vanek + + * netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: fixed hex output of certificate signature + for jdk8 + +2018-06-20 Jiri Vanek + + Added semi support for recognition jdk10 and up + * netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java: replaced hardcoded 9 by cycle from 9 to 99 + * netx/net/sourceforge/jnlp/resources/Messages.properties: replaced jdk9 by jdk9 and up. + 2018-05-28 Jiri Vanek added deployment property to enforce headfull execution diff -r 348532e210c0 -r 2d74ab38dd55 netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java Mon May 28 12:29:35 2018 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java Wed Jun 20 13:36:32 2018 +0200 @@ -281,8 +281,13 @@ } boolean findRT = false; - - if (processErrorStream.contains("\"9") || processStdOutStream.contains("\"9") || processErrorStream.contains("build 9") || processStdOutStream.contains("build 9")) { + boolean jdk9up = false; + for (int i = 9; i <= 99; i++) { + if (processErrorStream.contains("\"" + i) || processStdOutStream.contains("\"" + i)) { + jdk9up = true; + } + } + if (jdk9up) { validationResult += "" + Translator.R("CPJVMjdk9") + "
"; findRT = false; } else if (processErrorStream.contains("1.8.0") || processStdOutStream.contains("1.8.0")) { diff -r 348532e210c0 -r 2d74ab38dd55 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon May 28 12:29:35 2018 +0200 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Jun 20 13:36:32 2018 +0200 @@ -612,7 +612,7 @@ CPJVMjdk6=JDK6 recognized. JDK7 and older are longer supported. CPJVMjdk7=JDK7 recognized. JDK7 and older are longer supported. CPJVMjdk8=JDK8 recognized. Jdk8 and higher are supported -CPJVMjdk9=JDK9 recognized. Jdk8 and higher are supported +CPJVMjdk9=JDK9 or higher recognized. Jdk8 and higher are supported. Jdk9 and up can have modularity issues. CPJVMjdk=Unknown version. Hard to judge support. See tooltip or console/standard output (depends on verbosity)for real version. CPJVMoracleFound=Great, Oracle java detected CPJVMibmFound=Good, IBM java detected diff -r 348532e210c0 -r 2d74ab38dd55 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon May 28 12:29:35 2018 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 20 13:36:32 2018 +0200 @@ -275,7 +275,7 @@ try { SSLSocketFactory sslSocketFactory; SSLContext context = SSLContext.getInstance("SSL"); - KeyStore ks = KeyStores.getKeyStore(KeyStores.Level.USER, KeyStores.Type.CLIENT_CERTS); + KeyStore ks = KeyStores.getKeyStore(KeyStores.Level.USER, KeyStores.Type.CLIENT_CERTS).getKs(); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); SecurityUtil.initKeyManagerFactory(kmf, ks); TrustManager[] trust = new TrustManager[] { getSSLSocketTrustManager() }; diff -r 348532e210c0 -r 2d74ab38dd55 netx/net/sourceforge/jnlp/security/KeyStores.java --- a/netx/net/sourceforge/jnlp/security/KeyStores.java Mon May 28 12:29:35 2018 +0200 +++ b/netx/net/sourceforge/jnlp/security/KeyStores.java Wed Jun 20 13:36:32 2018 +0200 @@ -33,8 +33,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. -*/ - + */ package net.sourceforge.jnlp.security; import java.io.File; @@ -64,8 +63,26 @@ */ public final class KeyStores { + public static class KeyStoreWithPath { + + private final KeyStore ks; + private final String path; + + public KeyStoreWithPath(KeyStore ks, String path) { + this.ks = ks; + this.path = path; + } + + public KeyStore getKs() { + return ks; + } + + public String getPath() { + return path; + } + } + /* this gets turned into user-readable strings, see toUserReadableString */ - public enum Level { USER, SYSTEM, @@ -79,10 +96,10 @@ CLIENT_CERTS, } - public static final Map keystoresPaths=new HashMap<>(); + public static final Map keystoresPaths = new HashMap<>(); private static final String KEYSTORE_TYPE = "JKS"; - + /** * Returns a KeyStore corresponding to the appropriate level level (user or * system) and type. @@ -92,7 +109,7 @@ * @param type the type of KeyStore desired * @return a KeyStore containing certificates from the appropriate */ - public static final KeyStore getKeyStore(Level level, Type type) { + public static final KeyStoreWithPath getKeyStore(Level level, Type type) { boolean create; if (level == Level.USER) { create = true; @@ -112,7 +129,7 @@ * @param create true if keystore can be created * @return a KeyStore containing certificates from the appropriate */ - public static final KeyStore getKeyStore(Level level, Type type, boolean create) { + private static final KeyStoreWithPath getKeyStore(Level level, Type type, boolean create) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(new AllPermission()); @@ -124,11 +141,11 @@ ks = createKeyStoreFromFile(new File(location), create); //hashcode is used instead of instance so when no references are left //to keystore, then this will not be blocker for garbage collection - keystoresPaths.put(ks.hashCode(),location); + keystoresPaths.put(ks.hashCode(), location); } catch (Exception e) { OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); } - return ks; + return new KeyStoreWithPath(ks, location); } public static String getPathToKeystore(int k) { @@ -148,22 +165,22 @@ public static final KeyStore[] getCertKeyStores() { List result = new ArrayList<>(10); /* System-level JSSE certificates */ - KeyStore ks = getKeyStore(Level.SYSTEM, Type.JSSE_CERTS); + KeyStore ks = getKeyStore(Level.SYSTEM, Type.JSSE_CERTS).getKs(); if (ks != null) { result.add(ks); } /* System-level certificates */ - ks = getKeyStore(Level.SYSTEM, Type.CERTS); + ks = getKeyStore(Level.SYSTEM, Type.CERTS).getKs(); if (ks != null) { result.add(ks); } /* User-level JSSE certificates */ - ks = getKeyStore(Level.USER, Type.JSSE_CERTS); + ks = getKeyStore(Level.USER, Type.JSSE_CERTS).getKs(); if (ks != null) { result.add(ks); } /* User-level certificates */ - ks = getKeyStore(Level.USER, Type.CERTS); + ks = getKeyStore(Level.USER, Type.CERTS).getKs(); if (ks != null) { result.add(ks); } @@ -179,22 +196,22 @@ public static final KeyStore[] getCAKeyStores() { List result = new ArrayList<>(10); /* System-level JSSE CA certificates */ - KeyStore ks = getKeyStore(Level.SYSTEM, Type.JSSE_CA_CERTS); + KeyStore ks = getKeyStore(Level.SYSTEM, Type.JSSE_CA_CERTS).getKs(); if (ks != null) { result.add(ks); } /* System-level CA certificates */ - ks = getKeyStore(Level.SYSTEM, Type.CA_CERTS); + ks = getKeyStore(Level.SYSTEM, Type.CA_CERTS).getKs(); if (ks != null) { result.add(ks); } /* User-level JSSE CA certificates */ - ks = getKeyStore(Level.USER, Type.JSSE_CA_CERTS); + ks = getKeyStore(Level.USER, Type.JSSE_CA_CERTS).getKs(); if (ks != null) { result.add(ks); } /* User-level CA certificates */ - ks = getKeyStore(Level.USER, Type.CA_CERTS); + ks = getKeyStore(Level.USER, Type.CA_CERTS).getKs(); if (ks != null) { result.add(ks); } @@ -211,12 +228,12 @@ public static KeyStore[] getClientKeyStores() { List result = new ArrayList<>(); - KeyStore ks = getKeyStore(Level.SYSTEM, Type.CLIENT_CERTS); + KeyStore ks = getKeyStore(Level.SYSTEM, Type.CLIENT_CERTS).getKs(); if (ks != null) { result.add(ks); } - ks = getKeyStore(Level.USER, Type.CLIENT_CERTS); + ks = getKeyStore(Level.USER, Type.CLIENT_CERTS).getKs(); if (ks != null) { result.add(ks); } @@ -225,7 +242,8 @@ } /** - * Returns the location of a KeyStore corresponding to the given level and type. + * Returns the location of a KeyStore corresponding to the given level and + * type. * * @param level the specified level of the key store to be returned. * @param type the specified type of the key store to be returned. @@ -242,7 +260,7 @@ case JSSE_CERTS: return PathsAndFiles.SYS_JSSECERT; case CERTS: - return PathsAndFiles.SYS_CERT; + return PathsAndFiles.SYS_CERT; case CLIENT_CERTS: return PathsAndFiles.SYS_CLIENTCERT; } diff -r 348532e210c0 -r 2d74ab38dd55 netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java --- a/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Mon May 28 12:29:35 2018 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Wed Jun 20 13:36:32 2018 +0200 @@ -343,7 +343,7 @@ public void saveCert() { try { - KeyStore ks = KeyStores.getKeyStore(Level.USER, Type.CERTS); + KeyStore ks = KeyStores.getKeyStore(Level.USER, Type.CERTS).getKs(); X509Certificate c = (X509Certificate) parent.getCertVerifier().getPublisher(null); CertificateUtils.addToKeyStore(c, ks); File keyStoreFile = KeyStores.getKeyStoreLocation(Level.USER, Type.CERTS).getFile(); diff -r 348532e210c0 -r 2d74ab38dd55 netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java --- a/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Mon May 28 12:29:35 2018 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Wed Jun 20 13:36:32 2018 +0200 @@ -185,25 +185,28 @@ return jdkIndependentHexEncoderImpl(signature); } catch (Exception ex) { String s = "Failed to encode signature: " + ex.toString(); - OutputController.getLogger().log(s); + OutputController.getLogger().log(OutputController.Level.WARNING_ALL, s); + OutputController.getLogger().log(ex); return s; } } private String jdkIndependentHexEncoderImpl(byte[] signature) throws Exception { - // jdk8 is using sun.misc.HexDumpEncoder, - // jdk9 is using sun.security.util.HexDumpEncoder - Class clazz; try { - clazz = Class.forName("sun.security.util.HexDumpEncoder"); - } catch (ClassNotFoundException ex) { - OutputController.getLogger().log("Using jdk8's HexDumpEncoder"); - clazz = Class.forName("sun.misc.HexDumpEncoder"); + OutputController.getLogger().log("trying jdk9's HexDumpEncoder"); + Class clazz = Class.forName("sun.security.util.HexDumpEncoder"); + Object encoder = clazz.newInstance(); + Method m = clazz.getDeclaredMethod("encodeBuffer", byte[].class); + //convert our signature into a nice human-readable form. + return (String) m.invoke(encoder, signature); + } catch (Exception ex) { + OutputController.getLogger().log("trying jdk8's HexDumpEncoder"); + Class clazz = Class.forName("sun.misc.HexDumpEncoder"); + Object encoder = clazz.newInstance(); + Method m = clazz.getMethod("encode", byte[].class); + //convert our signature into a nice human-readable form. + return (String) m.invoke(encoder, signature); } - Object encoder = clazz.newInstance(); - Method m = clazz.getDeclaredMethod("encodeBuffer", byte[].class); - //convert our signature into a nice human-readable form. - return (String) m.invoke(encoder, signature); } /** diff -r 348532e210c0 -r 2d74ab38dd55 netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java --- a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Mon May 28 12:29:35 2018 +0200 +++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Wed Jun 20 13:36:32 2018 +0200 @@ -68,6 +68,7 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTable; +import javax.swing.JTextField; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; @@ -104,6 +105,7 @@ }; JTabbedPane tabbedPane; + JTextField certPath = new JTextField(); private final JTable userTable; private final JTable systemTable; private JComboBox certificateTypeCombo; @@ -120,7 +122,7 @@ * The Current KeyStore. Only one table/tab is visible for interaction to * the user. This KeyStore corresponds to that. */ - private KeyStore keyStore = null; + private KeyStores.KeyStoreWithPath keyStore = null; public CertificatePane(JDialog parent) { super(); @@ -229,8 +231,11 @@ } tablePanel.add(tabbedPane, BorderLayout.CENTER); - tablePanel.add(buttonPanel, BorderLayout.SOUTH); - + JPanel buttonPanelWrapper = new JPanel(new BorderLayout()); + certPath.setEditable(false); + buttonPanelWrapper.add(certPath, BorderLayout.CENTER); + buttonPanelWrapper.add(buttonPanel, BorderLayout.EAST); + tablePanel.add(buttonPanelWrapper, BorderLayout.SOUTH); main.add(certificateTypePanel, BorderLayout.NORTH); main.add(tablePanel, BorderLayout.CENTER); @@ -259,9 +264,9 @@ try { //Get all of the X509Certificates and put them into an ArrayList - aliases = keyStore.aliases(); + aliases = keyStore.getKs().aliases(); while (aliases.hasMoreElements()) { - Certificate c = keyStore.getCertificate(aliases.nextElement()); + Certificate c = keyStore.getKs().getCertificate(aliases.nextElement()); if (c instanceof X509Certificate) { certs.add((X509Certificate) c); } @@ -289,8 +294,20 @@ private void repopulateTables() { initializeKeyStore(); readKeyStore(); + try { + File src = new File(keyStore.getPath()); + File resolved = src.getCanonicalFile(); + if (resolved.equals(src)) { + certPath.setText(keyStore.getPath()); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, keyStore.getPath()); + } else { + certPath.setText(keyStore.getPath() + " -> " + resolved.getCanonicalPath()); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, keyStore.getPath() + " -> " + resolved.getCanonicalPath()); + } + } catch (Exception ex) { + OutputController.getLogger().log(ex); + } DefaultTableModel tableModel = new DefaultTableModel(issuedToAndBy, columnNames); - userTable.setModel(tableModel); tableModel = new DefaultTableModel(issuedToAndBy, columnNames); @@ -380,7 +397,7 @@ int returnVal = chooser.showOpenDialog(parent); if (returnVal == JFileChooser.APPROVE_OPTION) { try { - KeyStore ks = keyStore; + KeyStore ks = keyStore.getKs(); if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) { char[] password = getPassword(R("CVImportPasswordMessage")); if (password != null) { @@ -428,16 +445,16 @@ JFileChooser chooser = new JFileChooser(); int returnVal = chooser.showOpenDialog(parent); if (returnVal == JFileChooser.APPROVE_OPTION) { - String alias = keyStore.getCertificateAlias(certs + String alias = keyStore.getKs().getCertificateAlias(certs .get(selectedRow)); if (alias != null) { if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) { char[] password = getPassword(R("CVExportPasswordMessage")); if (password != null) { - CertificateUtils.dumpPKCS12(alias, chooser.getSelectedFile(), keyStore, password); + CertificateUtils.dumpPKCS12(alias, chooser.getSelectedFile(), keyStore.getKs(), password); } } else { - Certificate c = keyStore.getCertificate(alias); + Certificate c = keyStore.getKs().getCertificate(alias); PrintStream ps = new PrintStream(chooser.getSelectedFile().getAbsolutePath()); CertificateUtils.dump(c, ps); } @@ -469,7 +486,7 @@ int selectedRow = table.getSelectedRow(); if (selectedRow != -1) { - String alias = keyStore.getCertificateAlias(certs.get(selectedRow)); + String alias = keyStore.getKs().getCertificateAlias(certs.get(selectedRow)); if (alias != null) { int i = JOptionPane.showConfirmDialog(parent, @@ -477,12 +494,12 @@ R("CVRemoveConfirmTitle"), JOptionPane.YES_NO_OPTION); if (i == 0) { - keyStore.deleteEntry(alias); + keyStore.getKs().deleteEntry(alias); File keyStoreFile = KeyStores.getKeyStoreLocation(currentKeyStoreLevel, currentKeyStoreType).getFile(); if (!keyStoreFile.isFile()) { FileUtils.createRestrictedFile(keyStoreFile, true); } - SecurityUtil.storeKeyStore(keyStore, keyStoreFile); + SecurityUtil.storeKeyStore(keyStore.getKs(), keyStoreFile); } } repopulateTables(); From bugzilla-daemon at icedtea.classpath.org Sat Jun 23 01:40:05 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 23 Jun 2018 01:40:05 +0000 Subject: [Bug 3602] New: [IcedTea8] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3602 Bug ID: 3602 Summary: [IcedTea8] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" Product: IcedTea Version: 3.x-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugzilla.redhat.com/show_bug.cgi?id=1582032 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sat Jun 23 01:40:31 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 23 Jun 2018 01:40:31 +0000 Subject: [Bug 3602] [IcedTea8] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3602 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |3581 Target Milestone|--- |3.9.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sat Jun 23 01:40:31 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 23 Jun 2018 01:40:31 +0000 Subject: [Bug 3581] [TRACKER] IcedTea 3.9.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3581 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |3602 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sat Jun 23 01:41:52 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 23 Jun 2018 01:41:52 +0000 Subject: [Bug 3602] [IcedTea8] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3602 --- Comment #1 from Andrew John Hughes --- http://hg.openjdk.java.net/jdk9/client/jdk/rev/5b07559a4547 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 01:51:52 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 01:51:52 +0000 Subject: [Bug 3539] [IcedTea8] Pass EXTRA_LDFLAGS to HotSpot build In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3539 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://bugs.openjdk.java.n | |et/browse/JDK-8205104 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 02:33:41 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 02:33:41 +0000 Subject: [Bug 3603] New: [IcedTea8] Backport "8203182: Release session if initialization of SunPKCS11 Signature fails" Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3603 Bug ID: 3603 Summary: [IcedTea8] Backport "8203182: Release session if initialization of SunPKCS11 Signature fails" Product: IcedTea Version: 3.x-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugs.openjdk.java.net/browse/JDK-8203182 https://bugzilla.redhat.com/show_bug.cgi?id=1568033 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 02:33:59 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 02:33:59 +0000 Subject: [Bug 3581] [TRACKER] IcedTea 3.9.0 Release In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3581 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |3603 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 02:33:59 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 02:33:59 +0000 Subject: [Bug 3603] [IcedTea8] Backport "8203182: Release session if initialization of SunPKCS11 Signature fails" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3603 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |3581 Target Milestone|--- |3.9.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 16:35:31 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 16:35:31 +0000 Subject: [Bug 3604] New: Frequent JVM Crash SIGSEGV same stacktrace location during tomcat start with hibernate init on 7u181-2.6.14-0ubuntu0.1 Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3604 Bug ID: 3604 Summary: Frequent JVM Crash SIGSEGV same stacktrace location during tomcat start with hibernate init on 7u181-2.6.14-0ubuntu0.1 Product: IcedTea Version: 2.6.14 Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: stefan at huehner.org CC: unassigned at icedtea.classpath.org Created attachment 1689 --> https://icedtea.classpath.org/bugzilla/attachment.cgi?id=1689&action=edit archive with 7 different crash logs for this issue Note: Same is reported in ubuntu bugtracker here: https://bugs.launchpad.net/ubuntu/+source/openjdk-7/+bug/1778930 tdaitx from Ubuntu recommended to also report upstream here. Since update to 7u181 we are seeing JVM crash on starting tomacat7 with our application. Not happening 100% of the time but >75%. All crashes show a very similar stacktrace and happen during application loading process at same moment. Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) V [libjvm.so+0x418d57] V [libjvm.so+0x647253] JVM_FindClassFromClass+0x283 C [libverify.so+0x4a32] C [libverify.so+0x5a99] C [libverify.so+0x99fd] C [libverify.so+0xb742] VerifyClassForMajorVersion+0x15b2 V [libjvm.so+0x94a7cf] V [libjvm.so+0x95961c] V [libjvm.so+0x5b9905] V [libjvm.so+0x5bb243] V [libjvm.so+0x5bb9e1] V [libjvm.so+0x5eea00] j org.hibernate.type.TypeResolver.()V+8 j org.hibernate.cfg.Configuration.(Lorg/hibernate/cfg/SettingsFactory;)V+9 j org.hibernate.cfg.Configuration.()V+8 j org.openbravo.base.session.SessionFactoryController.initialize()V+21 j org.openbravo.base.session.SessionFactoryController.getSessionFactory()Lorg/hibernate/SessionFactory;+1 j org.openbravo.base.model.ModelProvider.initialize()V+23 j org.openbravo.base.model.ModelProvider.getModel()Ljava/util/List;+8 j org.openbravo.base.model.ModelProvider.refresh()V+27 j org.openbravo.dal.core.DalLayerInitializer.initialize(Z)V+16 We can consistently reproduce the problem in a (Amazon AWS) test-vm we have with following: - in linux x86_64 vm with 64bit jdk - Fails frequently when code is running as part of tomcat start - Same code (hibernate init) does not fail when run as cmdline outside of tomcat start - Can be reproduced in quite slow vm with single cpu core (aws m3.medium) - Cannot be reproduced in faster vm with 2 cpu cores (aws c4.large) A number of hs_err_*.log files are attached to this issue. So far we do not have a standalone reproducer as fails as part of bigger application (requiring populated sql db, tomcat, java...). -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 16:36:32 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 16:36:32 +0000 Subject: [Bug 3604] Frequent JVM Crash SIGSEGV same stacktrace location during tomcat start with hibernate init on 7u181-2.6.14-0ubuntu0.1 In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3604 --- Comment #1 from Stefan Huehner --- While we don't have simple reproducer yet we can grant access to the test-machine to interested dev if that helps. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 17:25:34 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 17:25:34 +0000 Subject: [Bug 3604] Frequent JVM Crash SIGSEGV same stacktrace location during tomcat start with hibernate init on 7u181-2.6.14-0ubuntu0.1 In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3604 --- Comment #2 from Stefan Huehner --- Created attachment 1690 --> https://icedtea.classpath.org/bugzilla/attachment.cgi?id=1690&action=edit gdb backtrace of the crash -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Jun 27 17:28:12 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 27 Jun 2018 17:28:12 +0000 Subject: [Bug 3604] Frequent JVM Crash SIGSEGV same stacktrace location during tomcat start with hibernate init on 7u181-2.6.14-0ubuntu0.1 In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3604 --- Comment #3 from Stefan Huehner --- Created attachment 1691 --> https://icedtea.classpath.org/bugzilla/attachment.cgi?id=1691&action=edit gdb: bt full backtrace -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jun 29 04:10:03 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jun 2018 04:10:03 +0000 Subject: [Bug 3602] [IcedTea8] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3602 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://bugs.openjdk.java.n | |et/browse/JDK-8075942 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jun 29 04:10:55 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jun 2018 04:10:55 +0000 Subject: [Bug 3605] New: [IcedTea7] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3605 Bug ID: 3605 Summary: [IcedTea7] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" Product: IcedTea Version: 2.x-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Clone of bug 3602 for IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jun 29 04:11:32 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jun 2018 04:11:32 +0000 Subject: [Bug 3605] [IcedTea7] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3605 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.15 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jun 29 05:24:45 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jun 2018 05:24:45 +0000 Subject: [Bug 3606] New: [IcedTea7] jni_util.c does not import header file which declares getLastErrorString Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3606 Bug ID: 3606 Summary: [IcedTea7] jni_util.c does not import header file which declares getLastErrorString Product: IcedTea Version: 2.x-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Clone of bug 3600 for IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jun 29 05:25:05 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jun 2018 05:25:05 +0000 Subject: [Bug 3606] [IcedTea7] jni_util.c does not import header file which declares getLastErrorString In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3606 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.15 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Fri Jun 29 16:45:18 2018 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:45:18 +0000 Subject: /hg/release/icedtea7-forest-2.6: 4 new changesets Message-ID: changeset 34180032633a in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=34180032633a author: andrew date: Wed May 09 17:41:48 2018 +0100 Added tag jdk7u181-b01 for changeset 947ae0aa8e0c changeset 474d8c372eca in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=474d8c372eca author: andrew date: Thu May 17 02:55:36 2018 +0100 Merge jdk7u181-b01 changeset 3cf747ef8b14 in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=3cf747ef8b14 author: andrew date: Thu May 24 04:03:52 2018 +0100 Added tag icedtea-2.6.14 for changeset 474d8c372eca changeset 6a07f1310d3f in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=6a07f1310d3f author: andrew date: Fri Jun 29 17:43:37 2018 +0100 Added tag icedtea-2.6.15pre01 for changeset 3cf747ef8b14 diffstat: .hgtags | 71 +++++++++++++++++- .jcheck/conf | 2 - buildhybrid.sh | 61 +++++++++++++++ buildnative.sh | 38 +++++++++ common/bin/hgforest.sh | 190 +++++++++++++++++++++++++++++++++++++++++++++++ get_source.sh | 4 +- make/Defs-internal.gmk | 1 + make/scripts/hgforest.sh | 144 ----------------------------------- 8 files changed, 361 insertions(+), 150 deletions(-) diffs (truncated from 681 to 500 lines): diff -r 947ae0aa8e0c -r 6a07f1310d3f .hgtags --- a/.hgtags Thu Apr 19 04:50:57 2018 +0100 +++ b/.hgtags Fri Jun 29 17:43:37 2018 +0100 @@ -50,6 +50,7 @@ 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73 2c88089b6e1c053597418099a14232182c387edc jdk7-b74 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 +f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 @@ -63,6 +64,7 @@ 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88 +195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91 @@ -111,6 +113,7 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136 +d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 @@ -123,6 +126,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 +3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 @@ -141,6 +145,7 @@ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21 +a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04 @@ -157,6 +162,7 @@ 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12 +e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15 @@ -186,11 +192,15 @@ 5f3645aa920d373b26d01b21f3b8b30fc4e10a0d jdk7u6-b10 cd64596c2dd7f195a6d38b6269bab23e7fad4361 jdk7u6-b11 61cfcee1d00cb4af288e640216af2bccbc3c9ef0 jdk7u6-b12 +cdab3bfb573b8832d539a8fa3e9c20f9f4965132 ppc-aix-port-b01 +06179726206f1411ed254f786be3477ca5763e37 ppc-aix-port-b02 +50f2b3cacf77467befb95b7d4fea15bbdb4d650a ppc-aix-port-b03 9b9a6d318e8aa5b8f0e42d2d3d2c0c34cb3f986d jdk7u6-b13 eff9ea1ca63df8656ebef9fedca0c647a210d807 jdk7u6-b14 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17 +0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20 @@ -258,11 +268,13 @@ c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07 1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08 87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09 +8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint 745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10 2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11 594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12 ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13 bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14 +a20ac67cdbc245d1c14fec3061703232501f8334 ppc-aix-port-b04 b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15 0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 @@ -379,6 +391,7 @@ f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18 82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30 f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31 +11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 b73c006b5d81528dfb4104a79b994b56675bf75d jdk7u45-b33 05742477836cb30235328181c8e6cae5d4bb06fd jdk7u45-b34 d0d5badd77abce0469830466ff7b910d3621d847 jdk7u45-b35 @@ -428,8 +441,11 @@ 11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01 6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02 +ba9872fc05cc333e3960551ae9fa61d51b8d5e06 icedtea-2.5pre01 +fc5d15cc35b4b47fe403c57fe4bf224fcfe1426c icedtea-2.5pre02 87f2193da40d3a2eedca95108ae78403c7bdcd49 jdk7u60-b03 d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u60-b04 +9d6e6533c1e5f6c335a604f5b58e6f4f93b3e3dd icedtea-2.6pre01 ea798405286d97f643ef809abcb1e13024b4f951 jdk7u60-b05 b0940b205cab942512b5bca1338ab96a45a67832 jdk7u60-b06 cae7bacaa13bb8c42a42fa35b156a7660874e907 jdk7u60-b07 @@ -439,7 +455,11 @@ 798468b91bcbb81684aea8620dbb31eaceb24c6c jdk7u60-b11 e40360c10b2ce5b24b1eea63160b78e112aa5d3f jdk7u60-b12 5e540a4d55916519f5604a422bfbb7a0967d0594 jdk7u60-b13 +07a06f1124248527df6a0caec615198a75f54673 icedtea-2.6pre02 +edf01342f3cb375746dba3620d359ac9a6e50aa8 icedtea-2.6pre03 1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14 +9f06098d4daa523fa85f5ee133ef91c3ecc1f242 icedtea-2.6pre04 +7c68cd21751684d6da92ef83e0128f473d2dddd6 icedtea-2.6pre05 a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15 19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16 472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17 @@ -579,10 +599,27 @@ 127bfeeddc9cf2f8cbf58052f32f6c8676fb8840 jdk7u79-b15 d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00 90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01 +390d699dae6114bbe08e4a9bb8da6fec390fb5d8 icedtea-2.6pre07 +b07e2aed0a26019953ce2ac6b88e73091374a541 icedtea-2.6pre06 +df23e37605061532939ee85bba23c8368425deee icedtea-2.6pre08 36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02 +7faf56bdd78300c06ef2dae652877d17c9be0037 icedtea-2.6pre09 +200124c2f78dbf82ea3d023fab9ce4636c4fd073 icedtea-2.6pre10 +05e485acec14af17c2fc4d9d29d58b14f1a0f960 icedtea-2.6pre11 4093bbbc90009bfd9311ccd6373c7a2f2755c9d9 jdk7u80-b03 +b70554883dbd0b13fdb3a7230ac8102c7c61f475 icedtea-2.6pre12 +f16c298d91bda698cd428254df2c3d2d21cc83c0 icedtea-2.6pre13 +97260abdb038f6ff28ea93a19e82b69fd73a344c icedtea-2.6pre14 +bda108a874bc1678966b65e97a87fac293a54fc8 icedtea-2.6pre15 +78bdb9406195da1811f2f52b46dec790158ca364 icedtea-2.6pre16 +f92696272981c10e64a80cb91ca6a747d8de3188 icedtea-2.6pre17 928d01695cd2b65119bbfcd51032ae427a66f83d jdk7u80-b04 46d516760a680deaeffdb03e3221648bc14c0818 jdk7u80-b05 +e229119aa0a088058254ee783b0437ee441d0017 icedtea-2.6pre18 +55ce37199ce35e9c554fefb265a98ec137acbaa2 icedtea-2.6pre19 +10d65b91c33c9b87bc6012ce753daed42c840dde icedtea-2.6pre20 +513069c9fc2037af7038dc44b0f26057fa815584 icedtea-2.6pre21 +851deec2e741fcb09bf96fc7a15ae285890fb832 icedtea-2.6pre22 8fffdc2d1faaf2c61abff00ee41f50d28da2174a jdk7u80-b06 6d0aaea852b04d7270fde5c289827b00f2391374 jdk7u80-b07 e8daab5fb25eb513c53d6d766d50caf662131d79 jdk7u80-b08 @@ -595,27 +632,57 @@ 611f7d38d9346243b558dc78409b813241eb426f jdk7u80-b30 f19659de2034611095d307ccc68f777abc8b008e jdk7u80-b15 458545155c9326c27b4e84a8a087f4419e8f122e jdk7u80-b32 -3b6a81ffb63654d5148168c2ba00288dfc833fe4 jdk7u85-b00 -76707a6d46afa9a057756f4d3614c0da1320499c jdk7u85-b01 +88ad67ad5b51c1e7316828de177808d4776b5357 icedtea-2.6pre23 +dbfa75121acab9c4dfbf5b28e3eba0e58905c4ef icedtea-2.6pre24 +8d08525bb2541367a4908a5f97298e0b21c12280 jdk7u85-b00 +e3845b02b0d1bfe203ab4783941d852a2b2d412d jdk7u85-b01 +dbfa75121acab9c4dfbf5b28e3eba0e58905c4ef icedtea-2.6.0 +dbfa75121acab9c4dfbf5b28e3eba0e58905c4ef icedtea-2.6-branchpoint +39b2c4354d0a235a5bc20ce286374bb242e9c62d icedtea-2.6.1 bc294917c5eb1ea2e655a2fcbd8fbb2e7cbd3313 jdk7u85-b02 +2265879728d802e3af28bcd9078431c56a0e26e5 icedtea-2.6.2pre01 +d27c76db0808b7a59313916e9880deded3368ed2 icedtea-2.6.2pre02 63d687368ce5bca36efbe48db2cf26df171b162d jdk7u91-b00 03b03194afbe87a049a1c6d83f49788602c363d8 jdk7u91-b01 +601ca7147b8c551d394ad97b6288b01c9e763ea4 icedtea-2.6.2 2be0ab1a24b2b6910d8f31e3314ffa48f30f21df jdk7u91-b02 +f0e7f22f09ef0ddd583eb8ce9a14edcccfa4f7ea icedtea-2.6.3 a28bc539342e4ca724a5abd2521c6a58f04c2113 jdk7u95-b00 +4f1e498cad9c7bc7ab0b6df99ebb4a29a8ca1c5e icedtea-2.6.4 251bb2a6d5cfbb76c0f4bdfecea4ca9c8af21558 jdk7u99-b00 +8e728c41fec5b9a945a12aecdd002ae1652d0253 icedtea-2.6.5 +b8b43305701a43c34b3be0957bc8d75a76d1b4c7 icedtea-2.6.6pre01 12491db47c7ccffcc3e881df68f4c2f727b44e5d jdk7u101-b00 +882cfee70fe876a273ba8f594d03219aa8192cef icedtea-2.6.6 +8c0c17064521873767912ca59dcc7a1f772399d2 icedtea-2.6.7pre01 bade1889699bab14082e84de3b40901964b52483 jdk7u111-b00 9b95c1ef81fe7bb010a6938d1cb97843b9a1fc68 jdk7u111-b01 +6aafb6fe0a1e36055566484bef4f93dba6c05ad2 icedtea-2.6.7 +a1ef40f591be786c98967b07650992c32905bc38 icedtea-2.6.8pre01 974935f4e21dae1170b5247a8af362617d105e1c jdk7u121-b00 +653c2662034dc87d063bc61c9741045041db7182 icedtea-2.6.8 +36a89571adf078953219bf591098eaf18bc7213f icedtea-2.6.9pre01 259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00 +2dd04ef37829f92208f9044177284fab5db04e28 icedtea-2.6.9 +cd7f56e178662fcdc453edb6622b404f53aaea56 icedtea-2.6.10pre01 e3b3add63d287cd07398949308308135ded4197e jdk7u141-b00 b21d7bc25e0f96c6ed9b19e1ea0ea6253c34d7fe jdk7u141-b01 db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02 +b3f98f0d454923698116f756711d79c0578f1a8e icedtea-2.6.10 +54009dd18b706ad1ef023cd472a8c1a76f9faac6 icedtea-2.6.11pre01 ae6c3762cdc9b1610211cd1ad1a29ed1a7f8471e jdk7u151-b00 c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01 +499e7894cc4485715dbcc4f1d7436feda0668b70 icedtea-2.6.11 +f53c56dda66385af2679e1f7e85b7cbe91aef52c icedtea-2.6.12pre01 a1aa7e729c1ad05387f5cb744c6cbd008414c600 jdk7u161-b00 0b57654ed07146c81b2c7ecf3afa2cc1fae49e22 jdk7u161-b01 +7d977b31457dc56120be84c2f5c3648d361131af icedtea-2.6.12 83e0c1100ed20e3538790aa66975c361fe352c58 jdk7u171-b00 00737b2c8cf25ed934ad99cec2e0bafbe6250524 jdk7u171-b01 3583ec341d97b25dba54b7437311f610f6da1c78 jdk7u171-b02 +61245205213a36a6f15e36e87da0f5b5e46f6300 icedtea-2.6.13 +c5dee4245cee7bec77cee8488e9a447c675c87cf icedtea-2.6.14pre01 4e3f7d29ecde70debbb0437c847f334acec0ebdb jdk7u181-b00 +947ae0aa8e0c49f3a779ea11d34224f629d7c861 jdk7u181-b01 +474d8c372eca0ee72dcca6144f3222d5cc8c2a7c icedtea-2.6.14 +3cf747ef8b14febe6db181ac9d5925d4cbdc4ff1 icedtea-2.6.15pre01 diff -r 947ae0aa8e0c -r 6a07f1310d3f .jcheck/conf --- a/.jcheck/conf Thu Apr 19 04:50:57 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 947ae0aa8e0c -r 6a07f1310d3f buildhybrid.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/buildhybrid.sh Fri Jun 29 17:43:37 2018 +0100 @@ -0,0 +1,61 @@ +#!/bin/sh +# check we have a simulator tree +if [ ! -d ../simulator ] ; then + echo "downloading aarch64 simulator code from sourceforge into directory ../simulator" + (cd .. ; hg clone http://hg.code.sourceforge.net/p/smallaarch64sim/code simulator) +fi + +# check we have a binutils tree + +if [ ! -d ../binutils ] ; then + echo "downloading aarch64 binutils code from sourceforge into directory ../binutils" + echo "by executing the following command" + (cd .. ; hg clone http://hg.code.sourceforge.net/p/binutilsaarch64/code binutils) +fi + +# ensure the sim lib has been built +if [ ! -f ../simulator/libarmsim.so ] ; then + (cd ../simulator ; make) +fi + +# ensure the hsdis lib has been built + +if [ ! -f hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so ] ; then + (export BINUTILS=`cd .. ; pwd`/binutils ; cd hotspot/src/share/tools/hsdis ; make BUILD_AARCH64=true) + mv hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-amd64.so hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so +fi + +unset JAVA_HOME +export LANG=C + +set -x + +if [ x"$JDK_TO_BUILD_WITH" == x ] ; then +JDK_TO_BUILD_WITH=/usr/lib/jvm/java-1.7.0 +fi + +source ./jdk/make/jdk_generic_profile.sh + +make \ +BUILTIN_SIM="true" \ +ALLOW_DOWNLOADS="true" \ +ALT_JDK_IMPORT_PATH="$JDK_TO_BUILD_WITH" \ +ALT_BOOTDIR="$JDK_TO_BUILD_WITH" \ +ANT="/usr/bin/ant" \ +FT2_CFLAGS="$(pkg-config --cflags freetype2)" \ +FT2_LIBS="$(pkg-config --libs freetype2)" \ +STATIC_CXX="false" \ +NO_DOCS="true" \ +DEBUG_CLASSFILES="true" \ +DEBUG_BINARIES="true" \ +STRIP_POLICY=no_strip \ +HOTSPOT_BUILD_JOBS=8 debug_build $* + +# ensure hsdis lib is installed +if [ ! -f build/linux-amd64-debug/j2sdk-image/jre/lib/amd64/hsdis-aarch64.so -a \ + -d build/linux-amd64-debug/j2sdk-image/jre/lib/amd64 ] ; then + cp hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so \ + build/linux-amd64-debug/j2sdk-image/jre/lib/amd64/hsdis-aarch64.so + cp hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so \ + build/linux-amd64-debug/j2sdk-server-image/jre/lib/amd64/hsdis-aarch64.so +fi diff -r 947ae0aa8e0c -r 6a07f1310d3f buildnative.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/buildnative.sh Fri Jun 29 17:43:37 2018 +0100 @@ -0,0 +1,38 @@ +# ensure the hsdis lib has been built + +if [ ! -f hotspot/src/share/tools/hsdis/build/linux-aarch64/hsdis-aarch64.so ] ; then + (export BINUTILS=`cd .. ; pwd`/binutils-2.23.52 ; cd hotspot/src/share/tools/hsdis ; make) +fi + +unset JAVA_HOME +export LANG=C + +set -x + +if [ x"$JDK_TO_BUILD_WITH" == x ] ; then +JDK_TO_BUILD_WITH=/usr/lib/jvm/java-1.7.0 +fi + +source ./jdk/make/jdk_generic_profile.sh + +make \ +ALT_JDK_IMPORT_PATH="$JDK_TO_BUILD_WITH" \ +ALT_BOOTDIR="$JDK_TO_BUILD_WITH" \ +ANT="/usr/bin/ant" \ +FT2_CFLAGS="$(pkg-config --cflags freetype2)" \ +FT2_LIBS="$(pkg-config --libs freetype2)" \ +STATIC_CXX="false" \ +NO_DOCS="true" \ +DEBUG_CLASSFILES="true" \ +DEBUG_BINARIES="true" \ +STRIP_POLICY=no_strip \ +HOTSPOT_BUILD_JOBS=8 debug_build $* + +# ensure hsdis lib is installed +if [ ! -f build/linux-aarch64-debug/j2sdk-image/jre/lib/aarch64/hsdis-aarch64.so -a \ + -d build/linux-aarch64-debug/j2sdk-image/jre/lib/aarch64 ] ; then + cp hotspot/src/share/tools/hsdis/build/linux-aarch64/hsdis-aarch64.so \ + build/linux-aarch64-debug/j2sdk-image/jre/lib/aarch64/hsdis-aarch64.so + cp hotspot/src/share/tools/hsdis/build/linux-aarch64/hsdis-aarch64.so \ + build/linux-aarch64-debug/j2sdk-server-image/jre/lib/aarch64/hsdis-aarch64.so +fi diff -r 947ae0aa8e0c -r 6a07f1310d3f common/bin/hgforest.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/bin/hgforest.sh Fri Jun 29 17:43:37 2018 +0100 @@ -0,0 +1,190 @@ +#!/bin/sh + +# +# Copyright (c) 2009, 2013, 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 +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Shell script for a fast parallel forest command +command="$1" +pull_extra_base="$2" + +if [ "" = "$command" ] ; then + echo No command to hg supplied! + exit 1 +fi + +# Clean out the temporary directory that stores the pid files. +tmp=/tmp/forest.$$ +rm -f -r ${tmp} +mkdir -p ${tmp} + +safe_interrupt () { + if [ -d ${tmp} ]; then + if [ "`ls ${tmp}/*.pid`" != "" ]; then + echo "Waiting for processes ( `cat ${tmp}/*.pid | tr '\n' ' '`) to terminate nicely!" + sleep 1 + # Pipe stderr to dev/null to silence kill, that complains when trying to kill + # a subprocess that has already exited. + kill -TERM `cat ${tmp}/*.pid | tr '\n' ' '` 2> /dev/null + wait + echo Interrupt complete! + fi + fi + rm -f -r ${tmp} + exit 1 +} + +nice_exit () { + if [ -d ${tmp} ]; then + if [ "`ls ${tmp}`" != "" ]; then + wait + fi + fi + rm -f -r ${tmp} +} + +trap 'safe_interrupt' INT QUIT +trap 'nice_exit' EXIT + +# Only look in specific locations for possible forests (avoids long searches) +pull_default="" +repos="" +repos_extra="" +if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then + subrepos="corba jaxp jaxws langtools jdk hotspot" + if [ -f .hg/hgrc ] ; then + pull_default=`hg paths default` + if [ "${pull_default}" = "" ] ; then + echo "ERROR: Need initial clone with 'hg paths default' defined" + exit 1 + fi + fi + if [ "${pull_default}" = "" ] ; then + echo "ERROR: Need initial repository to use this script" + exit 1 + fi + for i in ${subrepos} ; do + if [ ! -f ${i}/.hg/hgrc ] ; then + repos="${repos} ${i}" + fi + done + if [ "${pull_extra_base}" != "" ] ; then + subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs" + pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'` + pull_extra="${pull_extra_base}/${pull_default_tail}" + for i in ${subrepos_extra} ; do + if [ ! -f ${i}/.hg/hgrc ] ; then + repos_extra="${repos_extra} ${i}" + fi + done + fi + at_a_time=2 + # Any repos to deal with? + if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then + exit + fi +else + hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null` + # Derive repository names from the .hg directory locations + for i in ${hgdirs} ; do + repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`" + done + for i in ${repos} ; do + if [ -h ${i}/.hg/store/lock -o -f ${i}/.hg/store/lock ] ; then + locked="${i} ${locked}" + fi + done + at_a_time=8 + # Any repos to deal with? + if [ "${repos}" = "" ] ; then + echo "No repositories to process." + exit + fi + if [ "${locked}" != "" ] ; then + echo "These repositories are locked: ${locked}" + exit + fi +fi + +# Echo out what repositories we do a command on. +echo "# Repositories: ${repos} ${repos_extra}" +echo + +# Run the supplied command on all repos in parallel. +n=0 +for i in ${repos} ${repos_extra} ; do + n=`expr ${n} '+' 1` + repopidfile=`echo ${i} | sed -e 's at ./@@' -e 's@/@_ at g'` + reponame=`echo ${i} | sed -e :a -e 's/^.\{1,20\}$/ &/;ta'` + pull_base="${pull_default}" + for j in $repos_extra ; do + if [ "$i" = "$j" ] ; then + pull_base="${pull_extra}" + fi + done + ( + ( + if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then + pull_newrepo="${pull_base}/${i}" + # pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1 at g'`" + echo hg clone ${pull_newrepo} ${i} + path="`dirname ${i}`" + if [ "${path}" != "." ] ; then + times=0 + while [ ! -d "${path}" ] ## nested repo, ensure containing dir exists + do + times=`expr ${times} '+' 1` + if [ `expr ${times} '%' 10` -eq 0 ] ; then + echo ${path} still not created, waiting... + fi + sleep 5 + done + fi + (PYTHONUNBUFFERED=true hg clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& + else + echo "cd ${i} && hg $*" + cd ${i} && (PYTHONUNBUFFERED=true hg "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& + fi + echo $! > ${tmp}/${repopidfile}.pid + ) 2>&1 | sed -e "s@^@${reponame}: @") & + + if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then + sleep 2 + echo Waiting 5 secs before spawning next background command. + sleep 3 + fi +done +# Wait for all hg commands to complete +wait + +# Terminate with exit 0 only if all subprocesses were successful +ec=0 +if [ -d ${tmp} ]; then + for rc in ${tmp}/*.pid.rc ; do From andrew at icedtea.classpath.org Fri Jun 29 16:45:35 2018 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:45:35 +0000 Subject: /hg/release/icedtea7-forest-2.6/corba: 4 new changesets Message-ID: changeset 3f92ea51e60a in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=3f92ea51e60a author: andrew date: Wed May 09 17:41:49 2018 +0100 Added tag jdk7u181-b01 for changeset fe430a7489a4 changeset 8931f7345917 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=8931f7345917 author: andrew date: Thu May 17 02:55:36 2018 +0100 Merge jdk7u181-b01 changeset 1ed1155692c8 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=1ed1155692c8 author: andrew date: Thu May 24 04:03:48 2018 +0100 Added tag icedtea-2.6.14 for changeset 8931f7345917 changeset b49423a5b371 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=b49423a5b371 author: andrew date: Fri Jun 29 17:43:38 2018 +0100 Added tag icedtea-2.6.15pre01 for changeset 1ed1155692c8 diffstat: .hgtags | 67 +++++++++++ .jcheck/conf | 2 - make/Makefile | 2 +- make/common/shared/Defs-java.gmk | 6 +- make/common/shared/Platform.gmk | 9 + src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java | 2 +- 6 files changed, 83 insertions(+), 5 deletions(-) diffs (278 lines): diff -r fe430a7489a4 -r b49423a5b371 .hgtags --- a/.hgtags Thu Apr 19 04:50:58 2018 +0100 +++ b/.hgtags Fri Jun 29 17:43:38 2018 +0100 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -186,11 +192,15 @@ c9f6750370c9a99d149d73fd32c363d9959d19d1 jdk7u6-b10 a2089d3bf5a00be50764e1ced77e270ceddddb5d jdk7u6-b11 34354c623c450dc9f2f58981172fa3d66f51e89c jdk7u6-b12 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b01 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b02 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b03 76bee3576f61d4d96fef118902d5d237a4f3d219 jdk7u6-b13 731d5dbd7020dca232023f2e6c3e3e22caccccfb jdk7u6-b14 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -258,11 +268,13 @@ 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07 6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08 c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09 +efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint 3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10 3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11 fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12 cd7aaec5accf3f8fbb693153f8d9be846e0f8a05 jdk7u14-b13 9e8bde2586a1a7fd95f654c7d0043d1eb18f0793 jdk7u14-b14 +70af8b7907a504f7b6e4be1882054ca9f3ad1875 ppc-aix-port-b04 2b1fcbe4e78557822b2269b43c8b589aa1f0b522 jdk7u14-b15 622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01 30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02 @@ -381,6 +393,7 @@ 80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18 a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30 b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31 +c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33 aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34 fab1423e6ab8ecf36da8b6bf2e454156ec701e8a jdk7u45-b35 @@ -430,8 +443,11 @@ c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01 d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02 +47343904e95d315b5d2828cb3d60716e508656a9 icedtea-2.5pre01 +16906c5a09dab5f0f081a218f20be4a89137c8b1 icedtea-2.5pre02 d7e98ed925a3885380226f8375fe109a9a25397f jdk7u60-b03 1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u60-b04 +7224b2d0d3304b9d1d783de4d35d706dc7bcd00e icedtea-2.6pre01 753698a910167cc29c01490648a2adbcea1314cc jdk7u60-b05 9852efe6d6b992b73fdbf59e36fb3547a9535051 jdk7u60-b06 84a18429f247774fc7f1bc81de271da20b40845b jdk7u60-b07 @@ -441,7 +457,11 @@ a429ff635395688ded6c52cd21c0b4ce75e62168 jdk7u60-b11 d581875525aaf618afe901da31d679195ee35f4b jdk7u60-b12 2c8ba5f9487b0ac085874afd38f4c10a4127f62c jdk7u60-b13 +8293bea019e34e9cea722b46ba578fd4631f685f icedtea-2.6pre02 +35fa09c49527a46a29e210f174584cc1d806dbf8 icedtea-2.6pre03 02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14 +d99431d571f8aa64a348b08c6bf7ac3a90c576ee icedtea-2.6pre04 +90a4103857ca9ff64a47acfa6b51ca1aa5a782c3 icedtea-2.6pre05 e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15 e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16 b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17 @@ -581,10 +601,27 @@ 59faa52493939dccdf6ff9efe86371101769b8f9 jdk7u79-b15 1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00 df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01 +30f5a9254154b68dd16e2d93579d7606c79bd54b icedtea-2.6pre07 +250d1a2def5b39f99b2f2793821cac1d63b9629f icedtea-2.6pre06 +a756dcabdae6fcdff57a2d321088c42604b248a6 icedtea-2.6pre08 2444fa7df7e3e07f2533f6c875c3a8e408048f6c jdk7u80-b02 +4e8ca30ec092bcccd5dc54b3af2e2c7a2ee5399d icedtea-2.6pre09 +1a346ad4e322dab6bcf0fbfe989424a33dd6e394 icedtea-2.6pre10 +c11c54a2675c32eeb015450427424f277faaa95b icedtea-2.6pre11 fc6a39d6be24e0c1f7d9193e4f3ea4e474bb4dc3 jdk7u80-b03 +f2ef4247a9a496bb173a6592a6f13e716670b8d3 icedtea-2.6pre12 +9b3eb26f177e896dc081de80b5f0fe0bea12b5e4 icedtea-2.6pre13 +646234c2fd7be902c44261aa8f909dfd115f308d icedtea-2.6pre14 +9a9cde985e018164da97d4ed1b51a83cda59f93a icedtea-2.6pre15 +8eeadf4624006ab6af52354a15aee8f9a890fc16 icedtea-2.6pre16 +1eb2d75d86f049cd2f57c1ff35e3d569baec0650 icedtea-2.6pre17 d9ddd2aec6bee31e3bd8bb4eb258c27a624162c3 jdk7u80-b04 6696348644df30f1807acd3a38a603ebdf09480c jdk7u80-b05 +15250731630c137ff1bdbe1e9ecfe29deb7db609 icedtea-2.6pre18 +e4d788ed1e0747b9d1674127253cd25ce834a761 icedtea-2.6pre19 +4ca25161dc2a168bb21949f3986d33ae695e9d13 icedtea-2.6pre20 +0cc5634fda955189a1157ff5d899da6c6abf56c8 icedtea-2.6pre21 +c92957e8516c33f94e24e86ea1d3e536525c37f5 icedtea-2.6pre22 4362d8c11c43fb414a75b03616252cf8007eea61 jdk7u80-b06 1191862bb140612cc458492a0ffac5969f48c4df jdk7u80-b07 6a12979724faeb9abe3e6af347c64f173713e8a4 jdk7u80-b08 @@ -597,27 +634,57 @@ 52b7bbe24e490090f98bee27dbd5ec5715b31243 jdk7u80-b30 353be4a0a6ec19350d18e0e9ded5544ed5d7433f jdk7u80-b15 a97bddc81932c9772184182297291abacccc85c0 jdk7u80-b32 +9d5c92264131bcac8d8a032c055080cf51b18202 icedtea-2.6pre23 +e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6pre24 +e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6.0 02c5cee149d94496124f794b7ef89d860b8710ee jdk7u85-b00 a1436e2c0aa8c35b4c738004d19549df54448621 jdk7u85-b01 +e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6-branchpoint +2545636482d69e70bf482d41ba18dba27798f495 icedtea-2.6.1 7a91bf11c82bd794b7d6f63187345ebcbe07f37c jdk7u85-b02 +10bb9df77e39518afc9f65e7fdc7328bb0fb80dd icedtea-2.6.2pre01 +0445c54dcfb6cd523525a07eec0f2b26c43eb3c4 icedtea-2.6.2pre02 f9630ed441a06612f61a88bd3da39075015213a7 jdk7u91-b00 34be12b4b6ea5f30d364a916a92effeafdce678d jdk7u91-b01 +a4d55c5cec23631523672ca8b27767ec882eb835 icedtea-2.6.2 e3a6331d136ecac575730b498501f5b0dc4302e2 jdk7u91-b02 +9a3ca529125ad02ef3b0afd3c2f8fa6f80e0e46f icedtea-2.6.3 96b735f85c61ad721113713551271106a5070742 jdk7u95-b00 +2135da66cc53a606621024679ca16c06349eea58 icedtea-2.6.4 adda687205a9a40573fdb538240a5699fdc7dbd6 jdk7u99-b00 +389551542e139a9c84735a778726d1fdbac6105e icedtea-2.6.5 +bd2be90026f7655b1c21a67b14d812ca7a495064 icedtea-2.6.6pre01 9c164195bcc97da6c6567e6e6d55ea349f1c583d jdk7u101-b00 +ca3e3c4c5a615deab554708211e21db1b9febcf4 icedtea-2.6.6 +4e571f4f723b9bebca89b3ca0f1130f63e804b80 icedtea-2.6.7pre01 c1def4cc27fb92914168a5f65658eba4a1754dfe jdk7u111-b00 36715cc029596f86e977d486e547f62bb07eed74 jdk7u111-b01 +e5578d3bc593a075da3286a8e804dacb86e2e466 icedtea-2.6.7 +8bceffc6f67ec6202f067578051a94fd449e43b2 icedtea-2.6.8pre01 ad3a33a23c69608ae140d4564d045b62533f45a3 jdk7u121-b00 +9e002eaf26ed37030c32c6ab410ac278b8118ee2 icedtea-2.6.8 +ba84d0d43df1de8075f5ab5b02adfe1b964111ec icedtea-2.6.9pre01 d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00 +737fd3fbf1394a5640e3524679ef831347186853 icedtea-2.6.9 +dcdf5b845fa7dc9727327abf76bba06df4ce2ad7 icedtea-2.6.10pre01 61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00 caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01 39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02 +4d807b58849e7d0aa829ba744c9d94ffb78d0943 icedtea-2.6.10 +ff69bc83070b70b07cc9eea4731e9332acdcdff7 icedtea-2.6.11pre01 d232281a177cd3f80d48eca3f1bbc3919f720a1e jdk7u151-b00 f74af33b4963a7c484ffa605f11e41efd92966e3 jdk7u151-b01 +803456f62297d9d22725e414f29e09d0c008ca43 icedtea-2.6.11 +a7f8705b50f53a4d85ad515ac74b0167aa8251dc icedtea-2.6.12pre01 3b0441f9245b4f16adbaad16d9a2aef05cea734c jdk7u161-b00 8576df4be08028c725c29490eb52a329f361c56c jdk7u161-b01 +e759d9a6a7b2bb4ad2aefb36ff78fb14ad9b8172 icedtea-2.6.12 aba690a4e1de85b901c47f69f03e151da5f064d6 jdk7u171-b00 c0181fdc21a7e0eef1746aeae9cb56cf9dabacd1 jdk7u171-b01 04778a2bcd8efc8f2798c16586e432aa45ca66e8 jdk7u171-b02 +4b866e7eb48c28ebe61b3a64f6211ae88ec45ae5 icedtea-2.6.13 +e97826e565405def64c82c7deb36a43c43acf42d icedtea-2.6.14pre01 0f612c0a7de047b67fae07225826f834b18ce5da jdk7u181-b00 +fe430a7489a43bb3388719bd195582c1007e7a58 jdk7u181-b01 +8931f7345917b7df5a56108e6cd341b7d3f36afc icedtea-2.6.14 +1ed1155692c84d4d3357eb253a4aaaea5d0b6cd0 icedtea-2.6.15pre01 diff -r fe430a7489a4 -r b49423a5b371 .jcheck/conf --- a/.jcheck/conf Thu Apr 19 04:50:58 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r fe430a7489a4 -r b49423a5b371 make/Makefile --- a/make/Makefile Thu Apr 19 04:50:58 2018 +0100 +++ b/make/Makefile Fri Jun 29 17:43:38 2018 +0100 @@ -152,7 +152,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r fe430a7489a4 -r b49423a5b371 make/common/shared/Defs-java.gmk --- a/make/common/shared/Defs-java.gmk Thu Apr 19 04:50:58 2018 +0100 +++ b/make/common/shared/Defs-java.gmk Fri Jun 29 17:43:38 2018 +0100 @@ -79,7 +79,11 @@ # 64-bit builds require a larger thread stack size. ifeq ($(ARCH_DATA_MODEL), 32) - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 + ifeq ($(ARCH), ppc) + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152 + else + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 + endif else JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=2096 endif diff -r fe430a7489a4 -r b49423a5b371 make/common/shared/Platform.gmk --- a/make/common/shared/Platform.gmk Thu Apr 19 04:50:58 2018 +0100 +++ b/make/common/shared/Platform.gmk Fri Jun 29 17:43:38 2018 +0100 @@ -153,6 +153,9 @@ OS_VERSION := $(shell uname -r) # Arch and OS name/version mach := $(shell uname -m) + ifneq (,$(wildcard /usr/bin/dpkg-architecture)) + mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/') + endif archExpr = case "$(mach)" in \ i[3-9]86) \ echo i586 \ @@ -172,6 +175,9 @@ arm*) \ echo arm \ ;; \ + sh*) \ + echo sh \ + ;; \ *) \ echo $(mach) \ ;; \ @@ -199,6 +205,9 @@ else ARCH_DATA_MODEL=64 endif + ifeq ($(ARCH), sh) + ARCH_DATA_MODEL=32 + endif endif endif diff -r fe430a7489a4 -r b49423a5b371 src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java --- a/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Thu Apr 19 04:50:58 2018 +0100 +++ b/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Fri Jun 29 17:43:38 2018 +0100 @@ -77,7 +77,7 @@ * * throw SecurityException if SecurityManager is installed and * enableSubclassImplementation SerializablePermission - * is not granted or jdk.corba.allowOutputStreamSubclass system + * is not granted or jdk.corba.allowInputStreamSubclass system * property is either not set or is set to 'false' */ public InputStream() { From andrew at icedtea.classpath.org Fri Jun 29 16:45:58 2018 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:45:58 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxp: 5 new changesets Message-ID: changeset 13809448f345 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=13809448f345 author: ljiang date: Tue Mar 27 18:07:39 2018 -0700 8200314: JDK 8u171 l10n resource file update - msg drop 40 Reviewed-by: coffeys changeset 88542b5a14d9 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=88542b5a14d9 author: andrew date: Wed May 09 17:41:49 2018 +0100 Added tag jdk7u181-b01 for changeset 13809448f345 changeset 71fb2bb2ccdf in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=71fb2bb2ccdf author: andrew date: Thu May 17 02:55:36 2018 +0100 Merge jdk7u181-b01 changeset 8ddbfae3207e in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=8ddbfae3207e author: andrew date: Thu May 24 04:03:49 2018 +0100 Added tag icedtea-2.6.14 for changeset 71fb2bb2ccdf changeset 8816215f8a6e in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=8816215f8a6e author: andrew date: Fri Jun 29 17:43:39 2018 +0100 Added tag icedtea-2.6.15pre01 for changeset 8ddbfae3207e diffstat: .hgtags | 67 ++++++++++ .jcheck/conf | 2 - make/Makefile | 4 +- src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java | 4 +- src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java | 8 +- src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java | 10 + src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties | 8 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties | 8 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties | 4 +- src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties | 4 +- src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java | 2 +- src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java | 6 +- src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java | 12 +- 13 files changed, 107 insertions(+), 32 deletions(-) diffs (458 lines): diff -r 236e9466a0a9 -r 8816215f8a6e .hgtags --- a/.hgtags Thu Apr 19 04:50:59 2018 +0100 +++ b/.hgtags Fri Jun 29 17:43:39 2018 +0100 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -186,11 +192,15 @@ f4e80156296e43182a0fea5f54032d8c0fd0b41f jdk7u6-b10 5078a73b3448849f3328af5e0323b3e1b8d2d26c jdk7u6-b11 c378e596fb5b2ebeb60b89da7ad33f329d407e2d jdk7u6-b12 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b01 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b02 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b03 15b71daf5e69c169fcbd383c0251cfc99e558d8a jdk7u6-b13 da79c0fdf9a8b5403904e6ffdd8f5dc335d489d0 jdk7u6-b14 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -258,12 +268,14 @@ 1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07 427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08 366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09 +14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint 23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10 825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11 560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12 937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13 7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14 aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15 +1d1e1fc3b88d2fda0c7da55ee3abb2b455e0d317 ppc-aix-port-b04 99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01 edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02 14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30 @@ -382,6 +394,7 @@ 4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18 a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30 3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31 +d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00 056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33 b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34 7fda9b300e07738116b2b95b568229bdb4b31059 jdk7u45-b35 @@ -431,8 +444,11 @@ d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00 ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01 050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02 +74093b75ddd4fc2e578a3469d32b8bb2de3692d5 icedtea-2.5pre01 +d7085aad637fa90d027840c7f7066dba82b21667 icedtea-2.5pre02 359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03 7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04 +10314bfd5ba43a63f2f06353f3d219b877f5120f icedtea-2.6pre01 673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05 fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06 cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07 @@ -442,7 +458,11 @@ e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11 a9574b35f0af409fa1665aadd9b2997a0f9878dc jdk7u60-b12 92cf0b5c1c3e9b61d36671d8fb5070716e0f016b jdk7u60-b13 +a0138328f7db004859b30b9143ae61d598a21cf9 icedtea-2.6pre02 +33912ce9492d29c3faa5eb6787d5141f87ebb385 icedtea-2.6pre03 2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14 +c3178eab3782f4135ea21b060683d29bde3bbc7e icedtea-2.6pre04 +b9104a740dcd6ec07a868efd6f57dad3560e402c icedtea-2.6pre05 10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15 fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16 ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17 @@ -582,10 +602,27 @@ 6abf26813c3bd6047d5425e41dbc9dd1fd51cc63 jdk7u79-b15 7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00 4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01 +614b7c12f276c52ebef06fb17c79cf0eadbcc774 icedtea-2.6pre07 +75513ef5e265955b432550ec73770b8404a4d36b icedtea-2.6pre06 +fbc3c0ab4c1d53059c32d330ca36cb33a3c04299 icedtea-2.6pre08 25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02 +f59ee51637102611d2ecce975da8f4271bdee85f icedtea-2.6pre09 +603009854864635cbfc36e95f39b6da4070f541a icedtea-2.6pre10 +79d217da0a7a03fb071e7f2e99fbd5fc7c38aed5 icedtea-2.6pre11 1853995499cef61fc16e0e4b840276223314669b jdk7u80-b03 +1edb9d1d6451a8e147d74e69021bc3f00622b8c6 icedtea-2.6pre12 +a2841c1a7f292ee7ba33121435b566d347b99ddb icedtea-2.6pre13 +35cfccb24a9c229f960169ec986beae2329b0688 icedtea-2.6pre14 +133c38a2d10fdb95e332ceefa4db8cf765c8b413 icedtea-2.6pre15 +a41b3447afd7011c7d08b5077549695687b70ea4 icedtea-2.6pre16 +54100657ce67cb5164cb0683ceb58ae60542fd79 icedtea-2.6pre17 3f6f053831796f654ad8fd77a6e4f99163742649 jdk7u80-b04 b93c3e02132fd13971aea6df3c5f6fcd4c3b1780 jdk7u80-b05 +8cc37ea6edf6a464d1ef01578df02da984d2c79f icedtea-2.6pre18 +0e0fc4440a3ba74f0df5df62da9306f353e1d574 icedtea-2.6pre19 +3bb57abb921fcc182015e3f87b796af29fce4b68 icedtea-2.6pre20 +522863522a4d0b82790915d674ea37ef3b39c2a7 icedtea-2.6pre21 +8904cf73c0483d713996c71bf4496b748e014d2c icedtea-2.6pre22 d220098f4f327db250263b6c2b460fecec19331a jdk7u80-b06 535bdb640a91a8562b96799cefe9de94724ed761 jdk7u80-b07 3999f9baa3f0a28f82c6a7a073ad2f7a8e12866d jdk7u80-b08 @@ -598,27 +635,57 @@ 1b435d2f2050ac43a7f89aadd0fdaa9bf0441e3d jdk7u80-b30 acfe75cb9d7a723fbaae0bf7e1b0fb3429df4ff8 jdk7u80-b15 b45dfccc8773ad062c128f63fa8073b0645f7848 jdk7u80-b32 +9150a16a7b801124e13a4f4b1260badecd96729a icedtea-2.6pre23 +e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6pre24 +e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6.0 b50728249c16d97369f0ed3e9d45302eae3943e4 jdk7u85-b00 e9190eeef373a9d2313829a9561e32cb722d68a9 jdk7u85-b01 +e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6-branchpoint +ffbe529eeac7aa3b4cedd78be2f843c2f00f603c icedtea-2.6.1 d42101f9c06eebe7722c38d84d5ef228c0280089 jdk7u85-b02 +a5f1374a47150e3cdda1cc9a8775417ceaa62657 icedtea-2.6.2pre01 +4e264c1f6b2f335e0068608e9ec4c312cddde7a4 icedtea-2.6.2pre02 e95e9042c8f31c5fe3149afdbe114592a3e32e91 jdk7u91-b00 9f5bcd95c8d54f8cf5ab922b0b9e94f7ea6cdeb8 jdk7u91-b01 +f1202fb276950491aa1ed30e214351d235c94920 icedtea-2.6.2 6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02 +f7bf82fcbd098bc520ceb92f97890ee6f7da3506 icedtea-2.6.3 7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00 +bc6edb6c12a76b48a83ef8253dba8fe3007328e5 icedtea-2.6.4 c029d7572a67cb2fb3f9f2d8e91cbdda3beab95e jdk7u99-b00 +8a56658cb829a321fba2c80039e6aadc8ff936b1 icedtea-2.6.5 +5ab0648fce587283f45235377a07720aec742e7b icedtea-2.6.6pre01 dcdbebfaf4b42da4927d3d0c682205a23cd7cdb8 jdk7u101-b00 +683427778edf23bb16f6685a58e35d937d16f83d icedtea-2.6.6 +81a6bae36120086e865b83c3a6e282b1ea33cc39 icedtea-2.6.7pre01 be2127cf0435d141d8072a94dbe75a527ceda453 jdk7u111-b00 cd13b280e8247904509c28ee8aa9b45326185dd7 jdk7u111-b01 +b643540c673d0018dbed0673c8c20ca763be7c7d icedtea-2.6.7 +dfe9f8c968dfa846dbaf36f5605acd4e10764d65 icedtea-2.6.8pre01 b198ece212c1f7ff382d9282624411a260b52a55 jdk7u121-b00 +3369fa5a875b8c39e9dc2b16bd8486270947d73c icedtea-2.6.8 +6572cfcae3450e4fc9225ceecaf1acdb6dd5891a icedtea-2.6.9pre01 51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00 +aa1c302a99fb73dbd9db49e0c33990bd2d17016e icedtea-2.6.9 +82f4cfac52dbd67aafd16b47c131358738499f4a icedtea-2.6.10pre01 f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00 e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01 b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02 +4099d8cf255f2eac54b9d2ed1db1bc452ddbe4e4 icedtea-2.6.10 +f16026b79deb95d60dc9d213a0a417c626d00e4c icedtea-2.6.11pre01 26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00 57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01 +46f2d7395127d38d0f5fd9b270f4edeb8939b248 icedtea-2.6.11 +968b46df5f0e11aeec9382370067d86946e4b7ca icedtea-2.6.12pre01 abbd3cb1e6623bb1705e75350a9c696311250504 jdk7u161-b00 edff5672dccb2e5e02e5a628af0d561e61caf94e jdk7u161-b01 +1981a623381fad4a8ec6c55d9462cb7795932bd0 icedtea-2.6.12 7d2d2b0c42604742a66362b713043dee76956ba1 jdk7u171-b00 983871f8d1bc616ad9445aeec55eae508fc78eae jdk7u171-b01 69b8b134531ac80fc5bb5fed746c504fd2f710b4 jdk7u171-b02 +df965e45dd1fcd41126287542b5625dd3dcb100a icedtea-2.6.13 +4996b545086d0850ab89ea33e28989abcfcfdc78 icedtea-2.6.14pre01 c2f20a5bb465997cb93faac5a09013f3d7b92472 jdk7u181-b00 +13809448f345bb99cf71b87210499c5a3cec08ff jdk7u181-b01 +71fb2bb2ccdf2c63763b6a53e0265b74daa4da3a icedtea-2.6.14 +8ddbfae3207efb89d8dc761f4c9a3b8b02b07102 icedtea-2.6.15pre01 diff -r 236e9466a0a9 -r 8816215f8a6e .jcheck/conf --- a/.jcheck/conf Thu Apr 19 04:50:59 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 236e9466a0a9 -r 8816215f8a6e make/Makefile --- a/make/Makefile Thu Apr 19 04:50:59 2018 +0100 +++ b/make/Makefile Fri Jun 29 17:43:39 2018 +0100 @@ -118,13 +118,13 @@ ifdef ALT_LANGTOOLS_DIST ifdef ALT_BOOTDIR ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) + ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR) endif ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap else ifdef ALT_JDK_IMPORT_PATH ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) - ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) + ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH) endif endif diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java --- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Fri Jun 29 17:43:39 2018 +0100 @@ -398,7 +398,7 @@ * "" is a keyword that should not be translated. */ {ErrorMsg.ILLEGAL_TEXT_NODE_ERR, - "Textdata utanf\u00F6r det \u00F6versta elementet ."}, + "Textdata utanf\u00F6r toppniv\u00E5elementet ."}, /* * Note to translators: JAXP is an acronym for the Java API for XML @@ -548,7 +548,7 @@ * not be translated. */ {ErrorMsg.NO_MAIN_TRANSLET_ERR, - "Templates inneh\u00E5ller inte n\u00E5gon klass med namnet ''{0}''."}, + "Templates inneh\u00E5ller inte n\u00E5gon klass med namnet {0}."}, /* * Note to translators: The substitution text is the name of a class. diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java --- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Fri Jun 29 17:43:39 2018 +0100 @@ -567,8 +567,12 @@ } public NodeList makeNodeList(DTMAxisIterator iter) { - // TODO: gather nodes from all DOMs ? - return _main.makeNodeList(iter); + int index = iter.next(); + if (index == DTM.NULL) { + return null; + } + iter.reset(); + return _adapters[getDTMId(index)].makeNodeList(iter); } public String getLanguage(int node) { diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java --- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Fri Jun 29 17:43:39 2018 +0100 @@ -529,6 +529,16 @@ invalidByte(4, 4, b2); } + // check if output buffer is large enough to hold 2 surrogate chars + if (out + 1 >= ch.length) { + fBuffer[0] = (byte)b0; + fBuffer[1] = (byte)b1; + fBuffer[2] = (byte)b2; + fBuffer[3] = (byte)b3; + fOffset = 4; + return out - offset; + } + // decode bytes into surrogate characters int uuuuu = ((b0 << 2) & 0x001C) | ((b1 >> 4) & 0x0003); if (uuuuu > 0x10) { diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100 @@ -16,15 +16,15 @@ TextResourceError = Inkluderings\u00E5tg\u00E4rden utf\u00F6rdes inte, \u00E5terst\u00E4ller genom att \u00E5terskapa. Resursfel vid l\u00E4sning av fil som text (href=''{0}''). Orsak: {1} NO_XPointerSchema = Schema f\u00F6r "{0}" st\u00F6ds inte som standard. Definiera ett eget schema f\u00F6r {0}.Se http://apache.org/xml/properties/xpointer-schema NO_SubResourceIdentified = Ingen Subresource har identifierats av XPointer-processorn f\u00F6r pekare {0}. -NonDuplicateNotation = Flera noteringar anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter. -NonDuplicateUnparsedEntity = Flera otolkade enheter anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter. +NonDuplicateNotation = Flera noteringar anv\u00E4nds med namnet {0}, men som inte fastst\u00E4lls som dubbletter. +NonDuplicateUnparsedEntity = Flera otolkade enheter anv\u00E4nds med namnet {0}, men som inte fastst\u00E4lls som dubbletter. XpointerMissing = Om href-attribut saknas m\u00E5ste det finnas ett xpointer-attribut. AcceptMalformed = Tecken utanf\u00F6r intervallet #x20 till #x7E till\u00E5ts inte i v\u00E4rdet f\u00F6r 'accept'-attributet i 'include'-element. AcceptLanguageMalformed = Tecken utanf\u00F6r intervallet #x20 till #x7E till\u00E5ts inte i v\u00E4rdet f\u00F6r 'accept-language'-attributet i 'include'-element. RootElementRequired = Ett v\u00E4lformulerat dokument kr\u00E4ver ett rotelement. MultipleRootElements = Ett v\u00E4lformulerat dokument f\u00E5r inte inneh\u00E5lla flera rotelement. -ContentIllegalAtTopLevel = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 \u00F6versta niv\u00E5n f\u00E5r inte inneh\u00E5lla tecken. -UnexpandedEntityReferenceIllegal = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 \u00F6versta niv\u00E5n f\u00E5r inte inneh\u00E5lla ut\u00F6kade enhetsreferenser. +ContentIllegalAtTopLevel = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 toppniv\u00E5n f\u00E5r inte inneh\u00E5lla tecken. +UnexpandedEntityReferenceIllegal = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 toppniv\u00E5n f\u00E5r inte inneh\u00E5lla ut\u00F6kade enhetsreferenser. HrefFragmentIdentifierIllegal = Fragmentidentifierare f\u00E5r inte anv\u00E4ndas. ''href''-attributv\u00E4rdet ''{0}'' \u00E4r inte till\u00E5tet. HrefSyntacticallyInvalid = ''href''-attributv\u00E4rdet ''{0}'' \u00E4r syntaktiskt ogiltigt. Efter till\u00E4mpning av avbrottsregler har v\u00E4rdet varken syntaktiskt korrekt URI eller IRI. XPointerStreamability = En xpointer har angetts som pekar till en plats i k\u00E4llans informationsupps\u00E4ttning. Det finns ingen \u00E5tkomst till denna plats p\u00E5 grund av processorns str\u00F6mningsmetod. diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100 @@ -15,7 +15,7 @@ InvalidCharInCDSect = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i CDATA-sektionen. InvalidCharInContent = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets elementinneh\u00E5ll. TwoColonsInQName = En ogiltig andra f\u00F6rekomst av ':' hittades i elementtyp eller attributnamn. - ColonNotLegalWithNS = Kolon \u00E4r inte till\u00E5tet i namnet ''{0}'' om namnrymder \u00E4r aktiverade. + ColonNotLegalWithNS = Kolon \u00E4r inte till\u00E5tet i namnet {0} om namnrymder \u00E4r aktiverade. InvalidCharInMisc = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i kodtext efter elementinneh\u00E5llet. InvalidCharInProlog = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets prolog. InvalidCharInXMLDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i XML-deklarationen. @@ -176,7 +176,7 @@ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}". MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn m\u00E5ste anges i notationstyplistan f\u00F6r attributdeklarationen "{1}". NotationTypeUnterminated = Notationstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}". - MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen "{1}". + MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntoken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen "{1}". EnumerationUnterminated = Uppr\u00E4kningstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}". MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NMTOKENS i en och samma attributdeklaration f\u00F6r Enumeration m\u00E5ste vara unika. MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NOTATION-namn i en och samma attributdeklaration f\u00F6r NotationType m\u00E5ste vara unika. @@ -248,8 +248,8 @@ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten "{0}" som har deklarerats i en externt tolkad enhet \u00E4r inte till\u00E5tet i frist\u00E5ende dokument. MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" m\u00E5ste anges f\u00F6r elementtyp "{0}". MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Tomt utrymme f\u00E5r inte f\u00F6rekomma mellan element som har deklarerats i en externt tolkad enhet med elementinneh\u00E5ll i frist\u00E5ende dokument. - NMTOKENInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKEN m\u00E5ste vara ett namntecken. - NMTOKENSInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKENS m\u00E5ste vara ett eller flera namntecken. + NMTOKENInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKEN m\u00E5ste vara ett namntoken. + NMTOKENSInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKENS m\u00E5ste vara ett eller flera namntoken. NoNotationOnEmptyElement = Elementtyp "{0}" med deklarationen EMPTY kan inte deklareras med attributet "{1}" av typen NOTATION. RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet "{1}" m\u00E5ste matcha DOCTYPE-roten "{0}". UndeclaredElementInContentSpec = Modellen med inneh\u00E5ll f\u00F6r elementet "{0}" refererar till elementet "{1}" som inte har deklarerats. diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100 @@ -16,9 +16,9 @@ ResetInMiddle = Serializer kan inte \u00E5terst\u00E4llas under p\u00E5g\u00E5ende serialisering. Internal = Internt fel: elementstatus \u00E4r noll. NoName = Det finns inget rawName och localName \u00E4r null. - ElementQName = Elementnamnet ''{0}'' \u00E4r inte n\u00E5got QName. + ElementQName = Elementnamnet {0} \u00E4r inte n\u00E5got QName. ElementPrefix = Elementet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd. - AttributeQName = Attributnamnet ''{0}'' \u00E4r inte n\u00E5got QName. + AttributeQName = Attributnamnet {0} \u00E4r inte n\u00E5got QName. AttributePrefix = Attributet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd. InvalidNSDecl = Felaktig syntax i deklaration av namnrymd: {0}. EndingCDATA = Teckensekvensen "]]>" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion. diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100 @@ -10,7 +10,7 @@ # XPointer Framework Error Messages XPointerProcessingError = XPointerProcessingError: Ett fel intr\u00E4ffade vid bearbetning av XPointer-uttrycket. -InvalidXPointerToken = InvalidXPointerToken: XPointer-uttrycket inneh\u00E5ller ogiltigt tecken, ''{0}'' +InvalidXPointerToken = InvalidXPointerToken: XPointer-uttrycket inneh\u00E5ller ogiltigt token, ''{0}'' InvalidXPointerExpression = InvalidXPointerExpression: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. MultipleShortHandPointers = MultipleShortHandPointers: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. Det inneh\u00E5ller fler \u00E4n en ShortHand Pointer. SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. SchemeData efterf\u00F6ljdes inte av ett '')''-tecken. @@ -20,7 +20,7 @@ InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer-uttrycket ''{0}'' inneh\u00E5ller ogiltig SchemeData. # XPointer Element Scheme Error Messages -InvalidElementSchemeToken = InvalidElementSchemeToken: XPointer-uttrycket i element()-schemat inneh\u00E5ller ogiltigt tecken ''{0}'' +InvalidElementSchemeToken = InvalidElementSchemeToken: XPointer-uttrycket i element()-schemat inneh\u00E5ller ogiltigt token ''{0}'' InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: XPointer-uttrycket ''{0}'' i elementschemat \u00E4r ogiltigt. XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Ett fel intr\u00E4ffade vid bearbetning av schemauttrycket i XPointer element(). InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element()-schemat inneh\u00E5ller ShortHand-pekaren ''{0}'' med ogiltigt NCName. diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java --- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Fri Jun 29 17:43:39 2018 +0100 @@ -2116,7 +2116,7 @@ */ @Override public String getTextContent() throws DOMException { - return getNodeValue(); // overriden in some subclasses + return dtm.getStringValue(node).toString(); } /** diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java --- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Fri Jun 29 17:43:39 2018 +0100 @@ -3145,11 +3145,7 @@ m_data.elementAt(-dataIndex+1)); } } - else if (DTM.ELEMENT_NODE == type) - { - return getStringValueX(nodeHandle); - } - else if (DTM.DOCUMENT_FRAGMENT_NODE == type + else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type || DTM.DOCUMENT_NODE == type) { return null; diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java --- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Thu Apr 19 04:50:59 2018 +0100 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Fri Jun 29 17:43:39 2018 +0100 @@ -432,7 +432,7 @@ "FEL! Ok\u00E4nd op-kod: {0}"}, { ER_EXTRA_ILLEGAL_TOKENS, - "Extra otill\u00E5tna tecken: {0}"}, + "Extra otill\u00E5tna token: {0}"}, { ER_EXPECTED_DOUBLE_QUOTE, "Litteral omges av fel sorts citattecken... dubbla citattecken f\u00F6rv\u00E4ntade!"}, @@ -549,7 +549,7 @@ "I XPath.readObject: {0}"}, { ER_FUNCTION_TOKEN_NOT_FOUND, - "funktionstecken hittades inte."}, + "funktionstoken hittades inte."}, { ER_CANNOT_DEAL_XPATH_TYPE, "Kan inte hantera XPath-typ: {0}"}, @@ -643,13 +643,13 @@ // The message indicates that such an expression was expected following the // characters '/' or '//', but was not found. { ER_EXPECTED_REL_LOC_PATH, - "En relativ s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades efter tecknet '/' eller '//'."}, + "En relativ s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades efter token '/' eller '//'."}, // Note to translators: A location path is a form of XPath expression. // The message indicates that syntactically such an expression was expected,but // the characters specified by the substitution text were encountered instead. { ER_EXPECTED_LOC_PATH, - "En s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades, men f\u00F6ljande tecken p\u00E5tr\u00E4ffades: {0}"}, + "En s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades, men f\u00F6ljande token p\u00E5tr\u00E4ffades: {0}"}, // Note to translators: A location path is a form of XPath expression. // The message indicates that syntactically such a subexpression was expected, @@ -661,7 +661,7 @@ // The message indicates that syntactically such an expression was expected // following the specified characters. { ER_EXPECTED_LOC_STEP, - "Ett platssteg f\u00F6rv\u00E4ntades efter tecknet '/' eller '//'."}, + "Ett platssteg f\u00F6rv\u00E4ntades efter token '/' eller '//'."}, // Note to translators: A node test is part of an XPath expression that is // used to test for particular kinds of nodes. In this case, a node test that @@ -846,7 +846,7 @@ "XPath beh\u00F6ver ett h\u00E4rledningsobjekt f\u00F6r att implementera nodeTest!"}, { WG_FUNCTION_TOKEN_NOT_FOUND, - "funktionstecken hittades inte."}, + "funktionstoken hittades inte."}, { WG_COULDNOT_FIND_FUNCTION, "Hittade inte funktionen: {0}"}, From andrew at icedtea.classpath.org Fri Jun 29 16:46:28 2018 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:46:28 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxws: 4 new changesets Message-ID: changeset f48d5c299833 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=f48d5c299833 author: andrew date: Wed May 09 17:41:49 2018 +0100 Added tag jdk7u181-b01 for changeset 8a621c3b280b changeset 46e5171dd4ab in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=46e5171dd4ab author: andrew date: Thu May 17 02:55:37 2018 +0100 Merge jdk7u181-b01 changeset 37868584eef3 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=37868584eef3 author: andrew date: Thu May 24 04:03:49 2018 +0100 Added tag icedtea-2.6.14 for changeset 46e5171dd4ab changeset 419d3e9cd248 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=419d3e9cd248 author: andrew date: Fri Jun 29 17:43:40 2018 +0100 Added tag icedtea-2.6.15pre01 for changeset 37868584eef3 diffstat: .hgtags | 67 ++++++++++ .jcheck/conf | 2 - build.properties | 3 + build.xml | 14 +- make/Makefile | 4 +- src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 + 6 files changed, 90 insertions(+), 8 deletions(-) diffs (286 lines): diff -r 8a621c3b280b -r 419d3e9cd248 .hgtags --- a/.hgtags Thu Apr 19 04:50:59 2018 +0100 +++ b/.hgtags Fri Jun 29 17:43:40 2018 +0100 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -186,11 +192,15 @@ c08f88f5ae98917254cd38e204393adac22823a6 jdk7u6-b10 a37ad8f90c7bd215d11996480e37f03eb2776ce2 jdk7u6-b11 95a96a879b8c974707a7ddb94e4fcd00e93d469c jdk7u6-b12 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b01 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b02 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b03 e0a71584b8d84d28feac9594d7bb1a981d862d7c jdk7u6-b13 9ae31559fcce636b8c219180e5db1d54556db5d9 jdk7u6-b14 f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -258,11 +268,13 @@ 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 4fe9a362c3277cd4c7a5149853e5cf59dbba7cb7 jdk7u14-b13 a2b2e716637acdb9884d21fc4b9aef3c8b59e702 jdk7u14-b14 +53bd8e6a5ffabdc878a312509cf84a72020ddf9a ppc-aix-port-b04 b5c8ac5253ef735e5aa770b7325843ec89b56633 jdk7u14-b15 abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01 62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02 @@ -381,6 +393,7 @@ 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18 c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30 6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31 +cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00 e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33 e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34 c654ba4b2392c2913f45b495a2ea0c53cc348d98 jdk7u45-b35 @@ -430,8 +443,11 @@ cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00 f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01 8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02 +3f7212cae6eb1fe4b257adfbd05a7fce47c84bf0 icedtea-2.5pre01 +4aeccc3040fa45d7156dccb03984320cb75a0d73 icedtea-2.5pre02 d4ba4e1ed3ecdef1ef7c3b7aaf62ff69fc105cb2 jdk7u60-b03 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u60-b04 +1569dc36a61c49f3690911ce1e3741b36a5c16fd icedtea-2.6pre01 30afd3e2e7044b2aa87ce00ab4301990e6d94d27 jdk7u60-b05 dc6017fb9cde43bce92d403abc2821b741cf977c jdk7u60-b06 0380cb9d4dc27ed8e2c4fc3502e3d94b0ae0c02d jdk7u60-b07 @@ -441,7 +457,11 @@ 5d848774565b5e188d7ba915ce1cb09d8f3fdb87 jdk7u60-b11 9d34f726e35b321072ce5bd0aad2e513b9fc972f jdk7u60-b12 d941a701cf5ca11b2777fd1d0238e05e3c963e89 jdk7u60-b13 +ad282d85bae91058e1fcd3c10be1a6cf2314fcb2 icedtea-2.6pre02 +ef698865ff56ed090d7196a67b86156202adde68 icedtea-2.6pre03 43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14 +95bbd42cadc9ffc5e6baded38577ab18836c81c1 icedtea-2.6pre04 +5515daa647967f128ebb1fe5a0bdfdf853ee0dc0 icedtea-2.6pre05 d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15 2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16 b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17 @@ -581,10 +601,27 @@ 4ed47474a15acb48cd7f7fd3a4d9d3f8f457d914 jdk7u79-b15 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00 0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01 +f21a65d1832ce426c02a7d87b9d83b1a4a64018c icedtea-2.6pre07 +37d1831108b5ced7f1e63e1cd58b46dba7b76cc9 icedtea-2.6pre06 +646981c9ac471feb9c600504585a4f2c59aa2f61 icedtea-2.6pre08 579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02 +39dd7bed2325bd7f1436d48f2478bf4b0ef75ca3 icedtea-2.6pre09 +70a94bce8d6e7336c4efd50dab241310b0a0fce8 icedtea-2.6pre10 +2823343ab244aa3e78b2c351e719936592b05275 icedtea-2.6pre11 e24556d88882d7a683812d416e3409386dda4ceb jdk7u80-b03 +d4724872ee06431c99edda9b86115a2a7ec9c8a1 icedtea-2.6pre12 +26d6f6067c7ba517c98992828f9d9e87df20356d icedtea-2.6pre13 +8b238b2b6e64991f24d524a6e3ca878df11f1ba4 icedtea-2.6pre14 +8946500e8f3d879b28e1e257d3683efe38217b4b icedtea-2.6pre15 +4bd22fe291c59aaf427b15a64423bb38ebfff2e9 icedtea-2.6pre16 +f36becc08f6640b1f65e839d6d4c5bf7df23fcf4 icedtea-2.6pre17 aaa0e97579b680842c80b0cf14c5dfd14deddbb7 jdk7u80-b04 c104ccd5dec598e99b61ca9cb92fe4af26d450cc jdk7u80-b05 +5ee59be2092b1fcf93457a9c1a15f420146c7c0b icedtea-2.6pre18 +26c7686a4f96316531a1fccd53593b28d5d17416 icedtea-2.6pre19 +c901dec7bc96f09e9468207c130361f3cf0a727f icedtea-2.6pre20 +231ef27a86e2f79302aff0405298081d19f1344e icedtea-2.6pre21 +d4de5503ba9917a7b86e9f649343a80118ae5eca icedtea-2.6pre22 4f6bcbad3545ab33c0aa587c80abf22b23e08162 jdk7u80-b06 8cadb55300888be69636353d355bbcc85315f405 jdk7u80-b07 2fb372549f5be49aba26992ea1d44121b7671fd5 jdk7u80-b08 @@ -597,27 +634,57 @@ c1bf2f665c46d0e0b514bdeb227003f98a54a561 jdk7u80-b30 f6417ecaede6ee277f999f68e45959326dcd8f07 jdk7u80-b15 b0dd986766bc3e8b65dd6b3047574ddd3766e1ac jdk7u80-b32 +87290096a2fa347f3a0be0760743696c899d8076 icedtea-2.6pre23 +299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6pre24 +299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6.0 705d613d09cf73a0c583b79268a41cbb32139a5a jdk7u85-b00 bb46da1a45505cf19360d5a3c0d2b88bb46f7f3b jdk7u85-b01 +299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6-branchpoint +b9776fab65b80620f0c8108f255672db037f855c icedtea-2.6.1 902c8893132eb94b222850e23709f57c4f56e4db jdk7u85-b02 +26d406dd17b150fa1dc15549d67e294d869537dd icedtea-2.6.2pre01 +e8660c5ef3e5cce19f4459009e69270c52629312 icedtea-2.6.2pre02 8206da0912d36f48b023f983c0a3bd9235c33c12 jdk7u91-b00 3862008078f83ca7f7c669b1b9d1f0f2e256aad8 jdk7u91-b01 +14c411b1183cb5ef628c39cecae460a86357d24b icedtea-2.6.2 2230b8f8e03a8eaefc83acb577f30c4de88c45a7 jdk7u91-b02 +39ef53b9c4030cde1ced8232f94b143968f4d22e icedtea-2.6.3 3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00 +271b555de4386bd63e15dede60e4a18a8ce3199c icedtea-2.6.4 e0764f20b2894c5de39f1e235171d42d5f2703eb jdk7u99-b00 +9c049d7f5adcffa9347029056e0717c983327561 icedtea-2.6.5 +16ce6457a33aac9e72c93cebb4002bed46bf3d32 icedtea-2.6.6pre01 36ee37eedf25da13abde1c0b8974fb3b95c59c7c jdk7u101-b00 +63f7bf7ed2d4172ae55f6073d31dff9cbeb95900 icedtea-2.6.6 +bce6252889c7ecfe2c4fa0677feab31d0d2cf21e icedtea-2.6.7pre01 8fd4ada6c5d5c3f71cc52cc2af97c971a58c6b53 jdk7u111-b00 18074c212a8997055baa9aca9e9ae0dbbe90e1f4 jdk7u111-b01 +4a99f4eac2574c1d6c076b835e112d42ba7fbc7c icedtea-2.6.7 +6ae901b4503169508c710114b7cd1a701e86bea1 icedtea-2.6.8pre01 29919af594f46f158604db87edbd538a3890884a jdk7u121-b00 +26bcf28b3a6076e7b51f88d6d78d4709c8da93d4 icedtea-2.6.8 +3301b643d02c62f1b73f4fc70cfb52378ba0303e icedtea-2.6.9pre01 edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00 +ea96df8beff4c1b51c3e07cc290fd4792300f34e icedtea-2.6.9 +fc563206c50c7fc0ad45d68a921f60bf7b7d3b56 icedtea-2.6.10pre01 90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00 506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01 1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02 +bc4f48c1ccba5dc37b360629ebf4539e85d481bd icedtea-2.6.10 +f8bd60e998968cc16e72c76a7dc8eadb3a980960 icedtea-2.6.11pre01 1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00 3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01 +e17af60ebbd6a4cf4e75181ae474123e52eb0ebc icedtea-2.6.11 +3e70a6a17fa92207e127c6160961e958377728cf icedtea-2.6.12pre01 4f5edec6f3d8b2fb8395f345364d159c90b98cd7 jdk7u161-b00 a22ffaf9f3e8673569d8b16bb00b5b8e90368dc9 jdk7u161-b01 +40c37fd3e5cb7ce6c05202b18fb14cc45c2d55e7 icedtea-2.6.12 674305fbd3c88bb2d438dcf4f47ab702c9b1aa12 jdk7u171-b00 c9274b4ba0f17f55b09446a476c768da01f6ca65 jdk7u171-b01 c95eed3e13caea47d603ef927a25f785c63fab72 jdk7u171-b02 +efd5dbb3fe96c5592d2a24cfe38cdbc3081d08af icedtea-2.6.13 +7a010aa93cfc405e4f9db50c48f1feba2e6df444 icedtea-2.6.14pre01 143da44b6891f67b11962469c42937f6b60450b0 jdk7u181-b00 +8a621c3b280b56890df2232992279789e91027c9 jdk7u181-b01 +46e5171dd4ab170becff2069e1d1422a392822d2 icedtea-2.6.14 +37868584eef397f2d16d1b5374fa524c20c02aec icedtea-2.6.15pre01 diff -r 8a621c3b280b -r 419d3e9cd248 .jcheck/conf --- a/.jcheck/conf Thu Apr 19 04:50:59 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 8a621c3b280b -r 419d3e9cd248 build.properties --- a/build.properties Thu Apr 19 04:50:59 2018 +0100 +++ b/build.properties Fri Jun 29 17:43:40 2018 +0100 @@ -58,6 +58,9 @@ build.dir=${output.dir}/build build.classes.dir=${build.dir}/classes +# JAXP built files +jaxp.classes.dir=${output.dir}/../jaxp/build/classes + # Distributed results dist.dir=${output.dir}/dist dist.lib.dir=${dist.dir}/lib diff -r 8a621c3b280b -r 419d3e9cd248 build.xml --- a/build.xml Thu Apr 19 04:50:59 2018 +0100 +++ b/build.xml Fri Jun 29 17:43:40 2018 +0100 @@ -135,9 +135,15 @@ - + - + diff -r 8a621c3b280b -r 419d3e9cd248 make/Makefile --- a/make/Makefile Thu Apr 19 04:50:59 2018 +0100 +++ b/make/Makefile Fri Jun 29 17:43:40 2018 +0100 @@ -101,13 +101,13 @@ ifdef ALT_LANGTOOLS_DIST ifdef ALT_BOOTDIR ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) + ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR) endif ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap else ifdef ALT_JDK_IMPORT_PATH ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) - ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) + ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH) endif endif diff -r 8a621c3b280b -r 419d3e9cd248 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Thu Apr 19 04:50:59 2018 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Fri Jun 29 17:43:40 2018 +0100 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { From andrew at icedtea.classpath.org Fri Jun 29 16:46:43 2018 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:46:43 +0000 Subject: /hg/release/icedtea7-forest-2.6/langtools: 4 new changesets Message-ID: changeset f58aabbb507d in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=f58aabbb507d author: andrew date: Wed May 09 17:41:50 2018 +0100 Added tag jdk7u181-b01 for changeset 1c8c4da612ee changeset 3633e24edab7 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=3633e24edab7 author: andrew date: Thu May 17 02:55:37 2018 +0100 Merge jdk7u181-b01 changeset 7c19cbad9291 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=7c19cbad9291 author: andrew date: Thu May 24 04:03:51 2018 +0100 Added tag icedtea-2.6.14 for changeset 3633e24edab7 changeset 49668de3f025 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=49668de3f025 author: andrew date: Fri Jun 29 17:43:41 2018 +0100 Added tag icedtea-2.6.15pre01 for changeset 7c19cbad9291 diffstat: .hgtags | 67 + .jcheck/conf | 2 - make/Makefile | 4 + make/build.properties | 3 +- make/build.xml | 2 +- src/share/classes/com/sun/tools/javac/parser/JavacParser.java | 33 +- src/share/classes/com/sun/tools/javac/resources/compiler.properties | 4 + test/tools/javac/T5090006/broken.jar | Bin test/tools/javac/diags/examples/ForeachBadInitialization.java | 31 + test/tools/javac/enum/8069181/T8069181.java | 45 + test/tools/javac/parser/JavacParserTest.java | 886 ++++++++++ test/tools/javac/parser/netbeans/JavacParserTest.java | 716 -------- 12 files changed, 1061 insertions(+), 732 deletions(-) diffs (truncated from 2006 to 500 lines): diff -r 1c8c4da612ee -r 49668de3f025 .hgtags --- a/.hgtags Thu Apr 19 04:51:00 2018 +0100 +++ b/.hgtags Fri Jun 29 17:43:41 2018 +0100 @@ -50,6 +50,7 @@ 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75 +83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78 @@ -63,6 +64,7 @@ ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88 +681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91 @@ -111,6 +113,7 @@ 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136 +8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 @@ -123,6 +126,7 @@ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147 +fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04 @@ -141,6 +145,7 @@ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21 +58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04 @@ -157,6 +162,7 @@ 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12 +e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01 @@ -186,11 +192,15 @@ 21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10 13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11 f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b01 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b02 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b03 fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13 35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17 +cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20 @@ -258,11 +268,13 @@ 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07 7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08 96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09 +85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10 db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11 f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12 5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13 5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14 +d52538e72925a1da7b1fcff051b591beeb2452b4 ppc-aix-port-b04 5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02 @@ -382,6 +394,7 @@ ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18 164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30 7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31 +849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00 ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33 bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34 efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35 @@ -430,8 +443,11 @@ 849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00 b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01 954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02 +0d89cc5766d72e870eaf16696ec9b7b1ca4901fd icedtea-2.5pre01 +f75a642c2913e1ecbd22fc46812cffa2e7739169 icedtea-2.5pre02 4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04 +702454ac1a074e81890fb07da06ebf00370e42ed icedtea-2.6pre01 744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05 8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06 02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07 @@ -441,7 +457,11 @@ 3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11 b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12 3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13 +2040d4afc89815f6bf54a597ff58a70798b68e3d icedtea-2.6pre02 +2950924c2b80dc4d3933a8ab15a0ebb39522da5a icedtea-2.6pre03 a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14 +fa084876cf02f2f9996ad8a0ab353254f92c5564 icedtea-2.6pre04 +5f917c4b87a952a8bf79de08f3e2dd3e56c41657 icedtea-2.6pre05 7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15 057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16 b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17 @@ -581,10 +601,27 @@ e5e807700ff84f7bd9159ebc828891ae3ddb859c jdk7u79-b15 772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00 6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01 +3eab691bd9ac5222c11dbabb7b5fbc8463c62df6 icedtea-2.6pre07 +f43a81252f827395020fe71099bfa62f2ca0de50 icedtea-2.6pre06 +cdf407c97754412b02ebfdda111319dbd3cb9ca9 icedtea-2.6pre08 5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02 +55486a406d9f111eea8996fdf6144befefd86aff icedtea-2.6pre09 +cf836e0ed10de1179ec398a7db323e702b60ca35 icedtea-2.6pre10 +510234036e06ec8d7ed2a39ee11faf1b9a4257b0 icedtea-2.6pre11 bcbd241df6cd0a643480c8de183c541a662dd506 jdk7u80-b03 +987d772301e91c896178f47f39d82d87e9da1e39 icedtea-2.6pre12 +a072de9f83ed85a6a86d052d13488009230d7d4b icedtea-2.6pre13 +ecf2ec173dd2c19b63d7cf543db23ec7d4f4732a icedtea-2.6pre14 +029dd486cd1a8f6d7684b1633aae41c613055dd2 icedtea-2.6pre15 +c802d4cdd4cbfa8116e4f612cf536de32d67221a icedtea-2.6pre16 +e1dd8fea9abd3663838008063715b4b7ab5a58a4 icedtea-2.6pre17 04b56f4312b62d8bdf4eb1159132de8437994d34 jdk7u80-b04 f40fb76025c798cab4fb0e1966be1bceb8234527 jdk7u80-b05 +bb9d09219d3e74954b46ad53cb99dc307e39e120 icedtea-2.6pre18 +4c600e18a7e415702f6a62073c8c60f6b2cbfc11 icedtea-2.6pre19 +1a60fa408f57762abe32f19e4f3d681fb9c4960b icedtea-2.6pre20 +5331b041c88950058f8bd8e9669b9763be6ee03f icedtea-2.6pre21 +a322987c412f5f8584b15fab0a4505b94c016c22 icedtea-2.6pre22 335ee524dc68a42863f3fa3f081b781586e7ba2d jdk7u80-b06 6f7b359c4e9f82cbd399edc93c3275c3e668d2ea jdk7u80-b07 e6db2a97b3696fb5e7786b23f77af346a935a370 jdk7u80-b08 @@ -597,27 +634,57 @@ d0cc1c8ace99283d7b2354d2c0e5cd58787163c8 jdk7u80-b30 f2b4d5e42318ed93d35006ff7d1b3b0313b5a71f jdk7u80-b15 f1ffea3bd4a4df0f74ce0c127aeacf6bd11ee612 jdk7u80-b32 +403eeedf70f4b0e3c88f094d324e5c85959610e2 icedtea-2.6pre23 +bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6pre24 +bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6.0 1b20ca77fa98bb29d1f5601f027b3055e9eb28ee jdk7u85-b00 dce5a828bdd56d228724f1e9c6253920f613cec5 jdk7u85-b01 +bc95d2472055d96a712db09ecd8ab42e52058481 icedtea-2.6-branchpoint +9c6e1de67d7d26809d02c8ce3d6629503cb67d19 icedtea-2.6.1 b22cdae823bac193338d928e86319cd3741ab5fd jdk7u85-b02 +aef681a80dc1e8a8b69c1a06b463bda7999801ea icedtea-2.6.2pre01 +d627a940b6ca8fb4353f844e4f91163a3dcde0bc icedtea-2.6.2pre02 2741575d96f3985d41de8ebe1ba7fae8afbb0fde jdk7u91-b00 1a9e2dcc91dc3d0c103b09c478b3ac31ac45733f jdk7u91-b01 +73356b81c5c773a29729ae3b641516e0ac4a015d icedtea-2.6.2 08e99c45e470ce8b87875c1cbe78ac2f341555a3 jdk7u91-b02 +91fdb0c83e50c398bee5f0550600d20650f2a6ef icedtea-2.6.3 3c71abf7435352aee6e74ba2581274181ad3d17e jdk7u95-b00 +fd0a34cb97b40c622fc6d3370f5eca062e280979 icedtea-2.6.4 93a2788178e6ebebfbd30075f51ab35ac4f1b2a1 jdk7u99-b00 +f6593c32cc46f60438804b6a5b0d61e532f4a235 icedtea-2.6.5 +83f998d6c0afda7f3882ecc03ea873d988174c19 icedtea-2.6.6pre01 5713b8d2db3f1fc0c9802fdaf30ca802cddf8f65 jdk7u101-b00 +e42dd50480d3aab87668202ed79fb87f2dedcb91 icedtea-2.6.6 +264448dfed4e1bddd2da25aa3d3976bcabbb9ad6 icedtea-2.6.7pre01 e65eb66727550af75293996fc42e2c49c2002659 jdk7u111-b00 a5002845bff276d1a8e4bdb4a0dcb972509f7d07 jdk7u111-b01 +ca9d8b242a10f1987375b8eca38b368ee23db334 icedtea-2.6.7 +2e6c46aea99fdd650e5ff40877a98f466361e9dc icedtea-2.6.8pre01 3715f0221fd743e878ae5198dbaebe61ebd4fa97 jdk7u121-b00 +545e512eb4de948a44e6dd2187f386c644149aa7 icedtea-2.6.8 +4f7f0c054b2d447b4a283810abbba7a0558f0a87 icedtea-2.6.9pre01 240ca8086e7151b5c516b5b46d84201e4e8f5806 jdk7u131-b00 +dd8e22d986c8b0f50c25b1a35f981933a926d992 icedtea-2.6.9 +fd8dde40d9dd105f07880bd002feb73555fbb16b icedtea-2.6.10pre01 b1802aa8be3a49d2a5c07160f2406165e309efde jdk7u141-b00 853798299f7a4f38745632dc256219fbf75f861e jdk7u141-b01 ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02 +6e30439005f6e6a63661192738e27e8d374d72d8 icedtea-2.6.10 +a4814b6ff893d36aea91ccb16990d8a34840c07f icedtea-2.6.11pre01 4624941508c189c7b81c3393664741640a9b0467 jdk7u151-b00 205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01 +cddb1f9f8b9cee5f9c54ececf59ecb51e1bbb730 icedtea-2.6.11 +e24f25323b84858f039ff1a780805ca93dd60af8 icedtea-2.6.12pre01 6f72d747fa58d54e2d2e27755c0bcf2c7291682f jdk7u161-b00 e162e8d76cdd9f579e25f307f5485550fec2d024 jdk7u161-b01 +b87dbe0db6aa70ffb0443b5ef55e696e0ec5b124 icedtea-2.6.12 551dfae6260d4cd2cd929e14934b031d9319ad52 jdk7u171-b00 89a92f5cd9c112dc8f73d2cd25a54a437b753642 jdk7u171-b01 a10f2bfd1ce34bbbfd959a371eb709cc113039f2 jdk7u171-b02 +e952982cfa000f6fd9186d784112417148d33206 icedtea-2.6.13 +870812ffc2c6d6c2a1b1eddb53f9b9cb4eebf02a icedtea-2.6.14pre01 1f82b6ff3455cb2408f4501c1a12e911271d10fb jdk7u181-b00 +1c8c4da612ee78fef56eb892921d6f228f99e6b7 jdk7u181-b01 +3633e24edab763325da38137161d8a74c2d5b07b icedtea-2.6.14 +7c19cbad92914c9dc1c270c70892a4cfb78063e5 icedtea-2.6.15pre01 diff -r 1c8c4da612ee -r 49668de3f025 .jcheck/conf --- a/.jcheck/conf Thu Apr 19 04:51:00 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 1c8c4da612ee -r 49668de3f025 make/Makefile --- a/make/Makefile Thu Apr 19 04:51:00 2018 +0100 +++ b/make/Makefile Fri Jun 29 17:43:41 2018 +0100 @@ -111,6 +111,10 @@ ANT_OPTIONS += -Ddebug.classfiles=true endif +ifeq ($(JAVAC_WARNINGS_FATAL), false) + ANT_OPTIONS += -Djavac.warnings.fatal= +endif + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) ifdef TARGET_CLASS_VERSION diff -r 1c8c4da612ee -r 49668de3f025 make/build.properties --- a/make/build.properties Thu Apr 19 04:51:00 2018 +0100 +++ b/make/build.properties Fri Jun 29 17:43:41 2018 +0100 @@ -68,7 +68,8 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation -Werror +javac.warnings.fatal = -Werror +javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal} # options for the task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r 1c8c4da612ee -r 49668de3f025 make/build.xml --- a/make/build.xml Thu Apr 19 04:51:00 2018 +0100 +++ b/make/build.xml Fri Jun 29 17:43:41 2018 +0100 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> diff -r 1c8c4da612ee -r 49668de3f025 src/share/classes/com/sun/tools/javac/parser/JavacParser.java --- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu Apr 19 04:51:00 2018 +0100 +++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Fri Jun 29 17:43:41 2018 +0100 @@ -1962,10 +1962,15 @@ } else { JCExpression t = term(EXPR | TYPE); if ((lastmode & TYPE) != 0 && - (S.token() == IDENTIFIER || S.token() == ASSERT || S.token() == ENUM)) - return variableDeclarators(modifiersOpt(), t, stats).toList(); - else + (S.token() == IDENTIFIER || S.token() == ASSERT || + S.token() == ENUM)) { + return variableDeclarators(mods(pos, 0, List.nil()), t, stats).toList(); + } else if ((lastmode & TYPE) != 0 && S.token() == COLON) { + error(pos, "bad.initializer", "for-loop"); + return List.of((JCStatement)F.at(pos).VarDef(null, null, t, null)); + } else { return moreStatementExpressions(pos, t, stats).toList(); + } } } @@ -2057,16 +2062,20 @@ default: break; } - /* A modifiers tree with no modifier tokens or annotations - * has no text position. */ - if ((flags & (Flags.ModifierFlags | Flags.ANNOTATION)) == 0 && annotations.isEmpty()) - pos = Position.NOPOS; + return mods(pos, flags, annotations.toList()); + } + //where + JCModifiers mods(int pos, long flags, List annotations) { + /* A modifiers tree with no modifier tokens or annotations + * has no text position. */ + if ((flags & (Flags.ModifierFlags | Flags.ANNOTATION)) == 0 && annotations.isEmpty()) + pos = Position.NOPOS; - JCModifiers mods = F.at(pos).Modifiers(flags, annotations.toList()); - if (pos != Position.NOPOS) - storeEnd(mods, S.prevEndPos()); - return mods; - } + JCModifiers mods = F.at(pos).Modifiers(flags, annotations); + if (pos != Position.NOPOS) + storeEnd(mods, S.prevEndPos()); + return mods; + } /** Annotation = "@" Qualident [ "(" AnnotationFieldValues ")" ] * @param pos position of "@" token diff -r 1c8c4da612ee -r 49668de3f025 src/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Apr 19 04:51:00 2018 +0100 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Jun 29 17:43:41 2018 +0100 @@ -143,6 +143,10 @@ compiler.err.attribute.value.must.be.constant=\ attribute value must be constant +# 0: statement type +compiler.err.bad.initializer=\ + bad initializer for {0} + compiler.err.break.outside.switch.loop=\ break outside switch or loop diff -r 1c8c4da612ee -r 49668de3f025 test/tools/javac/T5090006/broken.jar Binary file test/tools/javac/T5090006/broken.jar has changed diff -r 1c8c4da612ee -r 49668de3f025 test/tools/javac/diags/examples/ForeachBadInitialization.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/ForeachBadInitialization.java Fri Jun 29 17:43:41 2018 +0100 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2012, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// key: compiler.err.bad.initializer +import java.util.List; +class ForeachBadInitialization { + void m() { + List s = null; + for (a : s) {} + } +} diff -r 1c8c4da612ee -r 49668de3f025 test/tools/javac/enum/8069181/T8069181.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/enum/8069181/T8069181.java Fri Jun 29 17:43:41 2018 +0100 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2015, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8069181 + * @summary java.lang.AssertionError when compiling JDK 1.4 code in JDK 8 + * + * @compile -source 1.4 T8069181.java + */ +import java.util.Enumeration; +import java.util.Hashtable; +class T8069181 { + void test() { + Hashtable hTable = new Hashtable(); + hTable.put("hello", "value"); + for (Enumeration enum = hTable.keys();;){ + if(!enum.hasMoreElements()) + break; + enum.nextElement(); + } + } +} diff -r 1c8c4da612ee -r 49668de3f025 test/tools/javac/parser/JavacParserTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/parser/JavacParserTest.java Fri Jun 29 17:43:41 2018 +0100 @@ -0,0 +1,886 @@ +/* + * Copyright (c) 2011, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 7073631 7159445 + * @summary tests error and diagnostics positions + * @author Jan Lahoda + */ + +import com.sun.source.tree.BinaryTree; +import com.sun.source.tree.BlockTree; +import com.sun.source.tree.ClassTree; +import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.tree.ErroneousTree; +import com.sun.source.tree.ExpressionStatementTree; +import com.sun.source.tree.ExpressionTree; +import com.sun.source.tree.MethodInvocationTree; +import com.sun.source.tree.MethodTree; +import com.sun.source.tree.ModifiersTree; +import com.sun.source.tree.StatementTree; +import com.sun.source.tree.Tree; +import com.sun.source.tree.Tree.Kind; +import com.sun.source.tree.VariableTree; +import com.sun.source.tree.WhileLoopTree; +import com.sun.source.util.SourcePositions; +import com.sun.source.util.TreeScanner; +import com.sun.source.util.Trees; +import com.sun.tools.javac.api.JavacTaskImpl; +import com.sun.tools.javac.tree.JCTree; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import javax.tools.Diagnostic; +import javax.tools.DiagnosticCollector; +import javax.tools.DiagnosticListener; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; + +public class JavacParserTest extends TestCase { + final JavaCompiler tool; + public JavacParserTest(String testName) { + tool = ToolProvider.getSystemJavaCompiler(); + System.out.println("java.home=" + System.getProperty("java.home")); + } + + static class MyFileObject extends SimpleJavaFileObject { + + private String text; + + public MyFileObject(String text) { + super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); + this.text = text; + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return text; + } + } + /* + * converts Windows to Unix style LFs for comparing strings + */ + private String normalize(String in) { + return in.replace(System.getProperty("line.separator"), "\n"); + } + + public CompilationUnitTree getCompilationUnitTree(String code) throws IOException { + + JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null, + null, Arrays.asList(new MyFileObject(code))); + CompilationUnitTree cut = ct.parse().iterator().next(); + return cut; + } + From andrew at icedtea.classpath.org Fri Jun 29 16:47:16 2018 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:47:16 +0000 Subject: /hg/release/icedtea7-forest-2.6/hotspot: 6 new changesets Message-ID: changeset d83c91306914 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=d83c91306914 author: mbalao date: Wed May 02 06:31:54 2018 +0100 8189123: More consistent classloading Reviewed-by: adinn, andrew changeset 6865c5a6ec36 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=6865c5a6ec36 author: mbalao date: Wed May 09 17:37:34 2018 +0100 8202850: Fix for 8189123 doesn't include precompiled header Reviewed-by: andrew Contributed-by: Michal Vala changeset b98edfb9bd25 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=b98edfb9bd25 author: andrew date: Wed May 09 17:41:51 2018 +0100 Added tag jdk7u181-b01 for changeset 6865c5a6ec36 changeset 56142fb6814b in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=56142fb6814b author: andrew date: Thu May 17 02:55:37 2018 +0100 Merge jdk7u181-b01 changeset 592120da2a2b in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=592120da2a2b author: andrew date: Thu May 24 04:03:52 2018 +0100 Added tag icedtea-2.6.14 for changeset 56142fb6814b changeset 307eb3563046 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=307eb3563046 author: andrew date: Fri Jun 29 17:43:42 2018 +0100 Added tag icedtea-2.6.15pre01 for changeset 592120da2a2b diffstat: .hgtags | 74 +- .jcheck/conf | 2 - agent/src/os/linux/Makefile | 11 +- agent/src/os/linux/elfmacros.h | 2 + agent/src/os/linux/libproc.h | 2 +- agent/src/os/linux/ps_core.c | 25 +- agent/src/os/linux/ps_proc.c | 52 +- agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java | 2 +- make/bsd/Makefile | 18 +- make/bsd/makefiles/gcc.make | 14 + make/bsd/makefiles/vm.make | 2 +- make/bsd/platform_zero.in | 2 +- make/defs.make | 23 +- make/linux/Makefile | 70 +- make/linux/makefiles/aarch64.make | 41 + make/linux/makefiles/adlc.make | 2 + make/linux/makefiles/buildtree.make | 3 + make/linux/makefiles/defs.make | 73 +- make/linux/makefiles/gcc.make | 55 +- make/linux/makefiles/jsig.make | 6 +- make/linux/makefiles/rules.make | 20 +- make/linux/makefiles/sa.make | 3 +- make/linux/makefiles/saproc.make | 8 +- make/linux/makefiles/vm.make | 77 +- make/linux/makefiles/zeroshark.make | 32 + make/linux/platform_aarch64 | 15 + make/linux/platform_zero.in | 2 +- make/solaris/makefiles/adlc.make | 6 +- make/solaris/makefiles/dtrace.make | 16 + make/solaris/makefiles/gcc.make | 4 +- make/solaris/makefiles/jsig.make | 4 + make/solaris/makefiles/rules.make | 10 - make/solaris/makefiles/saproc.make | 4 + make/solaris/makefiles/vm.make | 14 +- make/windows/create_obj_files.sh | 2 +- make/windows/makefiles/vm.make | 8 + src/cpu/aarch64/vm/aarch64.ad | 11928 ++++++++++ src/cpu/aarch64/vm/aarch64Test.cpp | 38 + src/cpu/aarch64/vm/aarch64_ad.m4 | 367 + src/cpu/aarch64/vm/aarch64_call.cpp | 197 + src/cpu/aarch64/vm/aarch64_linkage.S | 163 + src/cpu/aarch64/vm/ad_encode.m4 | 73 + src/cpu/aarch64/vm/assembler_aarch64.cpp | 5555 ++++ src/cpu/aarch64/vm/assembler_aarch64.hpp | 3616 +++ src/cpu/aarch64/vm/assembler_aarch64.inline.hpp | 44 + src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.cpp | 51 + src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.hpp | 117 + src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.inline.hpp | 287 + src/cpu/aarch64/vm/bytecodes_aarch64.cpp | 39 + src/cpu/aarch64/vm/bytecodes_aarch64.hpp | 32 + src/cpu/aarch64/vm/bytes_aarch64.hpp | 76 + src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 431 + src/cpu/aarch64/vm/c1_Defs_aarch64.hpp | 82 + src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.cpp | 203 + src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.hpp | 74 + src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp | 345 + src/cpu/aarch64/vm/c1_FrameMap_aarch64.hpp | 142 + src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 2956 ++ src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 80 + src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp | 1429 + src/cpu/aarch64/vm/c1_LinearScan_aarch64.cpp | 39 + src/cpu/aarch64/vm/c1_LinearScan_aarch64.hpp | 78 + src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp | 456 + src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp | 109 + src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp | 1347 + src/cpu/aarch64/vm/c1_globals_aarch64.hpp | 79 + src/cpu/aarch64/vm/c2_globals_aarch64.hpp | 87 + src/cpu/aarch64/vm/c2_init_aarch64.cpp | 37 + src/cpu/aarch64/vm/codeBuffer_aarch64.hpp | 36 + src/cpu/aarch64/vm/compile_aarch64.hpp | 40 + src/cpu/aarch64/vm/copy_aarch64.hpp | 62 + src/cpu/aarch64/vm/cppInterpreterGenerator_aarch64.hpp | 35 + src/cpu/aarch64/vm/cpustate_aarch64.hpp | 592 + src/cpu/aarch64/vm/debug_aarch64.cpp | 36 + src/cpu/aarch64/vm/decode_aarch64.hpp | 409 + src/cpu/aarch64/vm/depChecker_aarch64.cpp | 31 + src/cpu/aarch64/vm/depChecker_aarch64.hpp | 32 + src/cpu/aarch64/vm/disassembler_aarch64.hpp | 38 + src/cpu/aarch64/vm/dump_aarch64.cpp | 127 + src/cpu/aarch64/vm/frame_aarch64.cpp | 843 + src/cpu/aarch64/vm/frame_aarch64.hpp | 215 + src/cpu/aarch64/vm/frame_aarch64.inline.hpp | 332 + src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 36 + src/cpu/aarch64/vm/globals_aarch64.hpp | 126 + src/cpu/aarch64/vm/icBuffer_aarch64.cpp | 76 + src/cpu/aarch64/vm/icache_aarch64.cpp | 41 + src/cpu/aarch64/vm/icache_aarch64.hpp | 45 + src/cpu/aarch64/vm/immediate_aarch64.cpp | 312 + src/cpu/aarch64/vm/immediate_aarch64.hpp | 51 + src/cpu/aarch64/vm/interp_masm_aarch64.cpp | 1504 + src/cpu/aarch64/vm/interp_masm_aarch64.hpp | 286 + src/cpu/aarch64/vm/interpreterGenerator_aarch64.hpp | 57 + src/cpu/aarch64/vm/interpreterRT_aarch64.cpp | 429 + src/cpu/aarch64/vm/interpreterRT_aarch64.hpp | 66 + src/cpu/aarch64/vm/interpreter_aarch64.cpp | 314 + src/cpu/aarch64/vm/interpreter_aarch64.hpp | 44 + src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp | 79 + src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp | 175 + src/cpu/aarch64/vm/jniTypes_aarch64.hpp | 108 + src/cpu/aarch64/vm/jni_aarch64.h | 64 + src/cpu/aarch64/vm/methodHandles_aarch64.cpp | 445 + src/cpu/aarch64/vm/methodHandles_aarch64.hpp | 63 + src/cpu/aarch64/vm/nativeInst_aarch64.cpp | 318 + src/cpu/aarch64/vm/nativeInst_aarch64.hpp | 496 + src/cpu/aarch64/vm/registerMap_aarch64.hpp | 46 + src/cpu/aarch64/vm/register_aarch64.cpp | 55 + src/cpu/aarch64/vm/register_aarch64.hpp | 255 + src/cpu/aarch64/vm/register_definitions_aarch64.cpp | 156 + src/cpu/aarch64/vm/relocInfo_aarch64.cpp | 144 + src/cpu/aarch64/vm/relocInfo_aarch64.hpp | 39 + src/cpu/aarch64/vm/runtime_aarch64.cpp | 49 + src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 3127 ++ src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2380 + src/cpu/aarch64/vm/stubRoutines_aarch64.cpp | 290 + src/cpu/aarch64/vm/stubRoutines_aarch64.hpp | 128 + src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.hpp | 36 + src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp | 2199 + src/cpu/aarch64/vm/templateInterpreter_aarch64.hpp | 40 + src/cpu/aarch64/vm/templateTable_aarch64.cpp | 3905 +++ src/cpu/aarch64/vm/templateTable_aarch64.hpp | 43 + src/cpu/aarch64/vm/vmStructs_aarch64.hpp | 70 + src/cpu/aarch64/vm/vm_version_aarch64.cpp | 220 + src/cpu/aarch64/vm/vm_version_aarch64.hpp | 91 + src/cpu/aarch64/vm/vmreg_aarch64.cpp | 52 + src/cpu/aarch64/vm/vmreg_aarch64.hpp | 35 + src/cpu/aarch64/vm/vmreg_aarch64.inline.hpp | 65 + src/cpu/aarch64/vm/vtableStubs_aarch64.cpp | 245 + src/cpu/ppc/vm/ppc.ad | 6 +- src/cpu/ppc/vm/vm_version_ppc.cpp | 9 +- src/cpu/sparc/vm/sparc.ad | 12 +- src/cpu/sparc/vm/vm_version_sparc.cpp | 15 +- src/cpu/sparc/vm/vm_version_sparc.hpp | 8 +- src/cpu/x86/vm/assembler_x86.cpp | 10 +- src/cpu/x86/vm/c2_globals_x86.hpp | 2 +- src/cpu/x86/vm/stubGenerator_x86_32.cpp | 3 +- src/cpu/x86/vm/stubGenerator_x86_64.cpp | 6 +- src/cpu/x86/vm/vm_version_x86.cpp | 5 + src/cpu/x86/vm/vm_version_x86.hpp | 2 +- src/cpu/x86/vm/x86_64.ad | 61 +- src/cpu/zero/vm/arm32JIT.cpp | 8583 +++++++ src/cpu/zero/vm/arm_cas.S | 31 + src/cpu/zero/vm/asm_helper.cpp | 746 + src/cpu/zero/vm/bytecodes_arm.def | 7850 ++++++ src/cpu/zero/vm/bytecodes_zero.cpp | 52 +- src/cpu/zero/vm/bytecodes_zero.hpp | 41 +- src/cpu/zero/vm/cppInterpreter_arm.S | 7390 ++++++ src/cpu/zero/vm/cppInterpreter_zero.cpp | 49 + src/cpu/zero/vm/cppInterpreter_zero.hpp | 2 + src/cpu/zero/vm/methodHandles_zero.hpp | 6 +- src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +- src/cpu/zero/vm/stack_zero.hpp | 2 +- src/cpu/zero/vm/stack_zero.inline.hpp | 9 +- src/cpu/zero/vm/vm_version_zero.cpp | 12 +- src/cpu/zero/vm/vm_version_zero.hpp | 11 +- src/os/aix/vm/perfMemory_aix.cpp | 11 +- src/os/bsd/vm/chaitin_bsd.cpp | 42 - src/os/bsd/vm/os_bsd.cpp | 8 + src/os/linux/vm/chaitin_linux.cpp | 42 - src/os/linux/vm/globals_linux.hpp | 7 +- src/os/linux/vm/osThread_linux.cpp | 3 + src/os/linux/vm/os_linux.cpp | 353 +- src/os/linux/vm/os_linux.hpp | 4 +- src/os/linux/vm/os_linux.inline.hpp | 3 + src/os/linux/vm/thread_linux.inline.hpp | 5 + src/os/solaris/vm/chaitin_solaris.cpp | 46 - src/os/solaris/vm/os_solaris.cpp | 4 +- src/os/windows/vm/chaitin_windows.cpp | 78 - src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp | 8 +- src/os_cpu/linux_aarch64/vm/assembler_linux_aarch64.cpp | 53 + src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp | 144 + src/os_cpu/linux_aarch64/vm/bytes_linux_aarch64.inline.hpp | 44 + src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.inline.hpp | 124 + src/os_cpu/linux_aarch64/vm/globals_linux_aarch64.hpp | 46 + src/os_cpu/linux_aarch64/vm/linux_aarch64.S | 25 + src/os_cpu/linux_aarch64/vm/linux_aarch64.ad | 68 + src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp | 144 + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 755 + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp | 58 + src/os_cpu/linux_aarch64/vm/os_linux_aarch64.inline.hpp | 39 + src/os_cpu/linux_aarch64/vm/prefetch_linux_aarch64.inline.hpp | 45 + src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.cpp | 41 + src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.hpp | 36 + src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp | 92 + src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp | 85 + src/os_cpu/linux_aarch64/vm/vmStructs_linux_aarch64.hpp | 65 + src/os_cpu/linux_aarch64/vm/vm_version_linux_aarch64.cpp | 28 + src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 33 +- src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 22 +- src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 8 +- src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 43 +- src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 28 +- src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp | 242 +- src/share/tools/hsdis/Makefile | 19 +- src/share/tools/hsdis/hsdis.c | 12 + src/share/vm/adlc/formssel.cpp | 9 +- src/share/vm/adlc/main.cpp | 5 + src/share/vm/adlc/output_c.cpp | 2 +- src/share/vm/asm/assembler.cpp | 3 + src/share/vm/asm/assembler.hpp | 7 + src/share/vm/asm/codeBuffer.hpp | 5 +- src/share/vm/c1/c1_Canonicalizer.cpp | 7 + src/share/vm/c1/c1_Compilation.cpp | 26 + src/share/vm/c1/c1_Defs.hpp | 6 + src/share/vm/c1/c1_FpuStackSim.hpp | 3 + src/share/vm/c1/c1_FrameMap.cpp | 3 + src/share/vm/c1/c1_FrameMap.hpp | 3 + src/share/vm/c1/c1_LIR.cpp | 49 +- src/share/vm/c1/c1_LIR.hpp | 56 +- src/share/vm/c1/c1_LIRAssembler.cpp | 7 + src/share/vm/c1/c1_LIRAssembler.hpp | 6 + src/share/vm/c1/c1_LIRGenerator.cpp | 10 +- src/share/vm/c1/c1_LIRGenerator.hpp | 3 + src/share/vm/c1/c1_LinearScan.cpp | 6 +- src/share/vm/c1/c1_LinearScan.hpp | 3 + src/share/vm/c1/c1_MacroAssembler.hpp | 6 + src/share/vm/c1/c1_Runtime1.cpp | 36 +- src/share/vm/c1/c1_globals.hpp | 3 + src/share/vm/ci/ciInstanceKlass.cpp | 31 +- src/share/vm/ci/ciInstanceKlass.hpp | 6 +- src/share/vm/ci/ciMethod.cpp | 38 + src/share/vm/ci/ciMethod.hpp | 2 + src/share/vm/ci/ciTypeFlow.cpp | 2 +- src/share/vm/classfile/classFileParser.cpp | 10 +- src/share/vm/classfile/classFileStream.hpp | 3 + src/share/vm/classfile/classLoaderDependencies.cpp | 131 + src/share/vm/classfile/classLoaderDependencies.hpp | 39 + src/share/vm/classfile/javaClasses.cpp | 31 +- src/share/vm/classfile/javaClasses.hpp | 6 +- src/share/vm/classfile/stackMapTable.hpp | 3 + src/share/vm/classfile/systemDictionary.cpp | 1 - src/share/vm/classfile/verificationType.cpp | 7 +- src/share/vm/classfile/verifier.cpp | 31 +- src/share/vm/classfile/vmSymbols.hpp | 14 +- src/share/vm/code/codeBlob.cpp | 3 + src/share/vm/code/compiledIC.cpp | 2 +- src/share/vm/code/compiledIC.hpp | 3 + src/share/vm/code/icBuffer.cpp | 3 + src/share/vm/code/nmethod.cpp | 22 + src/share/vm/code/relocInfo.cpp | 4 + src/share/vm/code/relocInfo.hpp | 3 + src/share/vm/code/vmreg.hpp | 9 + src/share/vm/compiler/compileBroker.cpp | 6 +- src/share/vm/compiler/disassembler.cpp | 3 + src/share/vm/compiler/disassembler.hpp | 3 + src/share/vm/compiler/methodLiveness.cpp | 12 +- src/share/vm/compiler/oopMap.cpp | 7 + src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 2 +- src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 18 +- src/share/vm/gc_implementation/g1/concurrentMark.cpp | 2 +- src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 2 +- src/share/vm/gc_implementation/g1/g1MarkSweep.cpp | 11 + src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 15 +- src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 12 + src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 20 +- src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp | 7 +- src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +- src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 27 + src/share/vm/interpreter/abstractInterpreter.hpp | 8 + src/share/vm/interpreter/bytecode.hpp | 3 + src/share/vm/interpreter/bytecodeInterpreter.cpp | 31 +- src/share/vm/interpreter/bytecodeInterpreter.hpp | 28 +- src/share/vm/interpreter/bytecodeInterpreter.inline.hpp | 3 + src/share/vm/interpreter/bytecodeStream.hpp | 3 + src/share/vm/interpreter/bytecodes.cpp | 3 + src/share/vm/interpreter/bytecodes.hpp | 4 + src/share/vm/interpreter/cppInterpreter.hpp | 3 + src/share/vm/interpreter/cppInterpreterGenerator.hpp | 3 + src/share/vm/interpreter/interpreter.hpp | 3 + src/share/vm/interpreter/interpreterGenerator.hpp | 3 + src/share/vm/interpreter/interpreterRuntime.cpp | 7 +- src/share/vm/interpreter/interpreterRuntime.hpp | 5 +- src/share/vm/interpreter/templateInterpreter.hpp | 3 + src/share/vm/interpreter/templateInterpreterGenerator.hpp | 3 + src/share/vm/interpreter/templateTable.cpp | 5 + src/share/vm/interpreter/templateTable.hpp | 6 + src/share/vm/memory/allocation.hpp | 37 +- src/share/vm/memory/allocation.inline.hpp | 8 +- src/share/vm/memory/collectorPolicy.cpp | 20 +- src/share/vm/memory/defNewGeneration.cpp | 13 +- src/share/vm/memory/generation.cpp | 12 + src/share/vm/memory/tenuredGeneration.cpp | 12 + src/share/vm/oops/constantPoolOop.hpp | 3 + src/share/vm/oops/instanceKlass.cpp | 15 + src/share/vm/oops/instanceKlass.hpp | 5 + src/share/vm/oops/methodOop.cpp | 16 + src/share/vm/oops/methodOop.hpp | 6 + src/share/vm/oops/objArrayKlass.inline.hpp | 4 +- src/share/vm/oops/oop.inline.hpp | 3 + src/share/vm/oops/typeArrayOop.hpp | 3 + src/share/vm/opto/block.cpp | 506 +- src/share/vm/opto/block.hpp | 345 +- src/share/vm/opto/buildOopMap.cpp | 83 +- src/share/vm/opto/bytecodeInfo.cpp | 44 +- src/share/vm/opto/c2_globals.hpp | 16 +- src/share/vm/opto/c2compiler.cpp | 12 +- src/share/vm/opto/callGenerator.cpp | 62 +- src/share/vm/opto/callGenerator.hpp | 1 + src/share/vm/opto/callnode.cpp | 81 +- src/share/vm/opto/callnode.hpp | 68 +- src/share/vm/opto/cfgnode.cpp | 4 +- src/share/vm/opto/chaitin.cpp | 632 +- src/share/vm/opto/chaitin.hpp | 174 +- src/share/vm/opto/coalesce.cpp | 435 +- src/share/vm/opto/coalesce.hpp | 14 +- src/share/vm/opto/compile.cpp | 200 +- src/share/vm/opto/compile.hpp | 39 +- src/share/vm/opto/doCall.cpp | 14 +- src/share/vm/opto/domgraph.cpp | 73 +- src/share/vm/opto/escape.cpp | 80 +- src/share/vm/opto/gcm.cpp | 440 +- src/share/vm/opto/generateOptoStub.cpp | 49 + src/share/vm/opto/graphKit.cpp | 35 +- src/share/vm/opto/idealGraphPrinter.cpp | 32 +- src/share/vm/opto/ifg.cpp | 256 +- src/share/vm/opto/ifnode.cpp | 2 +- src/share/vm/opto/lcm.cpp | 310 +- src/share/vm/opto/library_call.cpp | 4 +- src/share/vm/opto/live.cpp | 115 +- src/share/vm/opto/live.hpp | 4 +- src/share/vm/opto/locknode.hpp | 3 + src/share/vm/opto/loopPredicate.cpp | 4 +- src/share/vm/opto/macro.cpp | 95 +- src/share/vm/opto/macro.hpp | 3 +- src/share/vm/opto/matcher.cpp | 27 +- src/share/vm/opto/matcher.hpp | 26 +- src/share/vm/opto/memnode.cpp | 646 +- src/share/vm/opto/memnode.hpp | 6 +- src/share/vm/opto/multnode.cpp | 32 +- src/share/vm/opto/multnode.hpp | 2 + src/share/vm/opto/node.cpp | 35 +- src/share/vm/opto/node.hpp | 2 +- src/share/vm/opto/output.cpp | 361 +- src/share/vm/opto/output.hpp | 6 +- src/share/vm/opto/parse.hpp | 8 +- src/share/vm/opto/parse1.cpp | 6 +- src/share/vm/opto/parse2.cpp | 12 +- src/share/vm/opto/parse3.cpp | 28 +- src/share/vm/opto/parseHelper.cpp | 5 + src/share/vm/opto/phase.cpp | 2 + src/share/vm/opto/phase.hpp | 1 + src/share/vm/opto/phaseX.cpp | 18 +- src/share/vm/opto/phasetype.hpp | 8 +- src/share/vm/opto/postaloc.cpp | 194 +- src/share/vm/opto/reg_split.cpp | 239 +- src/share/vm/opto/regalloc.hpp | 11 +- src/share/vm/opto/regmask.cpp | 3 + src/share/vm/opto/regmask.hpp | 3 + src/share/vm/opto/runtime.cpp | 3 + src/share/vm/opto/stringopts.cpp | 8 +- src/share/vm/opto/type.cpp | 64 +- src/share/vm/opto/type.hpp | 32 +- src/share/vm/prims/jni.cpp | 82 +- src/share/vm/prims/jniCheck.cpp | 45 +- src/share/vm/prims/jni_md.h | 3 + src/share/vm/prims/jvm.cpp | 7 + src/share/vm/prims/jvmtiClassFileReconstituter.cpp | 3 + src/share/vm/prims/jvmtiEnv.cpp | 3 + src/share/vm/prims/jvmtiExport.cpp | 41 + src/share/vm/prims/jvmtiExport.hpp | 7 + src/share/vm/prims/jvmtiTagMap.cpp | 8 +- src/share/vm/prims/methodHandles.hpp | 3 + src/share/vm/prims/unsafe.cpp | 63 + src/share/vm/prims/whitebox.cpp | 2 +- src/share/vm/runtime/advancedThresholdPolicy.cpp | 2 +- src/share/vm/runtime/arguments.cpp | 81 +- src/share/vm/runtime/atomic.cpp | 3 + src/share/vm/runtime/deoptimization.cpp | 6 + src/share/vm/runtime/dtraceJSDT.hpp | 3 + src/share/vm/runtime/frame.cpp | 3 + src/share/vm/runtime/frame.hpp | 6 + src/share/vm/runtime/frame.inline.hpp | 6 + src/share/vm/runtime/globals.hpp | 36 +- src/share/vm/runtime/icache.hpp | 3 + src/share/vm/runtime/interfaceSupport.hpp | 18 +- src/share/vm/runtime/java.cpp | 3 + src/share/vm/runtime/javaCalls.hpp | 3 + src/share/vm/runtime/javaFrameAnchor.hpp | 6 + src/share/vm/runtime/objectMonitor.cpp | 39 +- src/share/vm/runtime/os.cpp | 39 +- src/share/vm/runtime/os.hpp | 9 +- src/share/vm/runtime/registerMap.hpp | 6 + src/share/vm/runtime/relocator.hpp | 3 + src/share/vm/runtime/safepoint.cpp | 4 + src/share/vm/runtime/sharedRuntime.cpp | 26 + src/share/vm/runtime/stackValueCollection.cpp | 3 + src/share/vm/runtime/statSampler.cpp | 3 + src/share/vm/runtime/stubCodeGenerator.cpp | 3 + src/share/vm/runtime/stubRoutines.cpp | 5 + src/share/vm/runtime/stubRoutines.hpp | 6 + src/share/vm/runtime/thread.hpp | 5 +- src/share/vm/runtime/threadLocalStorage.hpp | 3 + src/share/vm/runtime/vframe.cpp | 3 +- src/share/vm/runtime/vframeArray.cpp | 2 +- src/share/vm/runtime/vmStructs.cpp | 21 +- src/share/vm/runtime/vm_version.cpp | 4 + src/share/vm/shark/sharkCompiler.cpp | 6 +- src/share/vm/shark/shark_globals.hpp | 10 + src/share/vm/trace/trace.dtd | 3 - src/share/vm/utilities/bitMap.hpp | 2 +- src/share/vm/utilities/bitMap.inline.hpp | 20 +- src/share/vm/utilities/copy.cpp | 171 +- src/share/vm/utilities/copy.hpp | 15 +- src/share/vm/utilities/debug.cpp | 12 +- src/share/vm/utilities/elfFile.cpp | 5 + src/share/vm/utilities/globalDefinitions.hpp | 8 + src/share/vm/utilities/globalDefinitions_gcc.hpp | 8 - src/share/vm/utilities/globalDefinitions_sparcWorks.hpp | 9 - src/share/vm/utilities/globalDefinitions_xlc.hpp | 8 - src/share/vm/utilities/macros.hpp | 22 +- src/share/vm/utilities/ostream.cpp | 2 +- src/share/vm/utilities/taskqueue.hpp | 3 + src/share/vm/utilities/vmError.cpp | 23 +- src/share/vm/utilities/vmError.hpp | 8 + test/compiler/6934604/TestByteBoxing.java | 777 + test/compiler/6934604/TestDoubleBoxing.java | 777 + test/compiler/6934604/TestFloatBoxing.java | 777 + test/compiler/6934604/TestIntBoxing.java | 777 + test/compiler/6934604/TestLongBoxing.java | 777 + test/compiler/6934604/TestShortBoxing.java | 777 + test/compiler/codegen/8144028/BitTests.java | 164 + test/compiler/codegen/IntRotateWithImmediate.java | 24 +- test/compiler/floatingpoint/TestFloatJNIArgs.java | 86 + test/compiler/floatingpoint/TestFloatJNIArgs.sh | 104 + test/compiler/floatingpoint/libTestFloatJNIArgs.c | 68 + test/compiler/loopopts/ConstFPVectorization.java | 63 + test/compiler/stringopts/TestStringObjectInitialization.java | 78 + test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java | 315 + test/runtime/7020373/GenOOMCrashClass.java | 157 + test/runtime/7020373/Test7020373.sh | 4 + test/runtime/7020373/testcase.jar | Bin test/runtime/InitialThreadOverflow/DoOverflow.java | 41 + test/runtime/InitialThreadOverflow/invoke.cxx | 70 + test/runtime/InitialThreadOverflow/testme.sh | 73 + test/runtime/RedefineFinalizer/RedefineFinalizer.java | 64 + test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java | 143 + test/runtime/StackGap/T.java | 33 + test/runtime/StackGap/exestack-gap.c | 82 + test/runtime/StackGap/testme.sh | 48 + test/runtime/os/AvailableProcessors.java | 102 + test/runtime/stackMapCheck/BadMap.jasm | 152 + test/runtime/stackMapCheck/BadMapDstore.jasm | 79 + test/runtime/stackMapCheck/BadMapIstore.jasm | 79 + test/runtime/stackMapCheck/StackMapCheck.java | 63 + test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java | 82 + test/serviceability/jvmti/UnresolvedClassAgent.java | 69 + test/serviceability/jvmti/UnresolvedClassAgent.mf | 3 + test/test_env.sh | 5 + test/testlibrary/RedefineClassHelper.java | 79 + test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java | 81 +- test/testlibrary/com/oracle/java/testlibrary/Utils.java | 263 + test/testlibrary_tests/RedefineClassTest.java | 54 + tools/mkbc.c | 607 + 453 files changed, 93514 insertions(+), 3305 deletions(-) diffs (truncated from 109415 to 500 lines): diff -r 5559874a74ad -r 307eb3563046 .hgtags --- a/.hgtags Thu Apr 19 04:51:00 2018 +0100 +++ b/.hgtags Fri Jun 29 17:43:42 2018 +0100 @@ -50,6 +50,7 @@ faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75 +b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 @@ -87,6 +88,7 @@ 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88 +a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90 @@ -160,6 +162,7 @@ b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06 +591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138 @@ -182,6 +185,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17 +7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 @@ -210,6 +214,7 @@ 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21 +f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04 @@ -264,6 +269,7 @@ f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16 +a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01 @@ -302,6 +308,9 @@ e974e15945658e574e6c344c4a7ba225f5708c10 hs23.2-b03 f08a3a0e60c32cb0e8350e72fdc54849759096a4 jdk7u6-b12 7a8d3cd6562170f4c262e962270f679ac503f456 hs23.2-b04 +d72dd66fdc3d52aee909f8dd8f25f62f13569ffa ppc-aix-port-b01 +1efaab66c81d0a5701cc819e67376f1b27bfea47 ppc-aix-port-b02 +b69b779a26dfc5e2333504d0c82fc998ff915499 ppc-aix-port-b03 28746e6d615f27816f483485a53b790c7a463f0c jdk7u6-b13 202880d633e646d4936798d0fba6efc0cab04dc8 hs23.2-b05 6b0f178141388f5721aa5365cb542715acbf0cc7 jdk7u6-b14 @@ -311,6 +320,7 @@ cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17 +354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09 @@ -440,6 +450,7 @@ 4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07 3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08 92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09 +6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint 7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29 181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10 4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30 @@ -496,6 +507,7 @@ 273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32 e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34 +ca298f18e21dc66c6b5235600f8b50bcc9bbaa38 ppc-aix-port-b04 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15 be21f8a4d42c03cafde4f616fd80ece791ba2f21 hs24-b35 10e0043bda0878dbc85f3f280157eab592b47c91 jdk7u14-b16 @@ -590,6 +602,9 @@ 12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18 3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30 520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31 +ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00 +af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 +cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01 c373a733d5d5147f99eaa2b91d6b937c28214fc9 jdk7u45-b33 0bcb43482f2ac5615437541ffb8dc0f79ece3148 jdk7u45-b34 12ea8d416f105f5971c808c89dddc1006bfc4c53 jdk7u45-b35 @@ -646,6 +661,8 @@ 0025a2a965c8f21376278245c2493d8861386fba jdk7u60-b02 fa59add77d1a8f601a695f137248462fdc68cc2f hs24.60-b05 a59134ccb1b704b2cd05e157970d425af43e5437 hs24.60-b06 +bc178be7e9d6fcc97e09c909ffe79d96e2305218 icedtea-2.5pre01 +f30e87f16d90f1e659b935515a3fc083ab8a0156 icedtea-2.5pre02 2c971ed884cec0a9293ccff3def696da81823225 jdk7u60-b03 1afbeb8cb558429156d432f35e7582716053a9cb hs24.60-b07 05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u60-b04 @@ -810,13 +827,36 @@ ff18bcebe2943527cdbc094375c38c27ec7f2442 hs24.80-b03 1b9722b5134a8e565d8b8fe851849e034beff057 hs24.80-b04 04d6919c44db8c9d811ef0ac4775a579f854cdfc hs24.80-b05 +882a93010fb90f928331bf31a226992755d6cfb2 icedtea-2.6pre01 ee18e60e7e8da9f1912895af353564de0330a2b1 hs24.80-b06 +138ef7288fd40de0012a3a24839fa7cb3569ab43 icedtea-2.6pre02 +4ab69c6e4c85edf628c01c685bc12c591b9807d9 icedtea-2.6pre03 +b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14 +2fd819c8b5066a480f9524d901dbd34f2cf563ad icedtea-2.6pre04 +fae3b09fe959294f7a091a6ecaae91daf1cb4f5c icedtea-2.6pre05 05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u80-b00 e2533d62ca887078e4b952a75a75680cfb7894b9 jdk7u80-b01 +8ffb87775f56ed5c602f320d2513351298ee4778 icedtea-2.6pre07 +b517477362d1b0d4f9b567c82db85136fd14bc6e icedtea-2.6pre06 +6d5ec408f4cac2c2004bf6120403df1b18051a21 icedtea-2.6pre08 bad107a5d096b070355c5a2d80aa50bc5576144b jdk7u80-b02 +4722cfd15c8386321c8e857951b3cb55461e858b icedtea-2.6pre09 +c8417820ac943736822e7b84518b5aca80f39593 icedtea-2.6pre10 +e13857ecc7870c28dbebca79ff36612693dac157 icedtea-2.6pre11 9d2b485d2a58ea57ab2b3c06b2128f456ab39a38 jdk7u80-b03 +0c2099cd04cd24778c5baccc7c8a72c311ef6f84 icedtea-2.6pre12 +c6fa18ed8a01a15e1210bf44dc7075463e0a514b icedtea-2.6pre13 +1d3d9e81c8e16bfe948da9bc0756e922a3802ca4 icedtea-2.6pre14 +5ad4c09169742e076305193c1e0b8256635cf33e icedtea-2.6pre15 +7891f0e7ae10d8f636fdbf29bcfe06f43d057e5f icedtea-2.6pre16 +4d25046abb67ae570ae1dbb5e3e48e7a63d93b88 icedtea-2.6pre17 a89267b51c40cba0b26fe84831478389723c8321 jdk7u80-b04 00402b4ff7a90a6deba09816192e335cadfdb4f0 jdk7u80-b05 +1792bfb4a54d87ff87438413a34004a6b6004987 icedtea-2.6pre18 +8f3c9cf0636f4d40e9c3647e03c7d0ca6d1019ee icedtea-2.6pre19 +904317834a259bdddd4568b74874c2472f119a3c icedtea-2.6pre20 +1939c010fd371d22de5c1baf2583a96e8f38da44 icedtea-2.6pre21 +cb42e88f9787c8aa28662f31484d605e550c6d53 icedtea-2.6pre22 87d4354a3ce8aafccf1f1cd9cb9d88a58731dde8 jdk7u80-b06 d496bd71dc129828c2b5962e2072cdb591454e4a jdk7u80-b07 5ce33a4444cf74e04c22fb11b1e1b76b68a6477a jdk7u80-b08 @@ -829,27 +869,57 @@ 27e0103f3b11f06bc3277914564ed9a1976fb3d5 jdk7u80-b30 426e09df7eda980317d1308af15c29ef691cd471 jdk7u80-b15 198c700d102cc2051b304fc382ac58c5d76e8d26 jdk7u80-b32 -ea2051eb6ee8be8e292711caaae05a7014466ddc jdk7u85-b00 -1c6c2bdf4321c0ece7723663341f7f1a35cac843 jdk7u85-b01 +1afefe2d5f90112e87034a4eac57fdad53fe5b9f icedtea-2.6pre23 +94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6pre24 +94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6.0 +501fc984fa3b3d51e1a7f1220f2de635a2b370b9 jdk7u85-b00 +3f1b4a1fe4a274cd1f89d9ec83d8018f7f4b7d01 jdk7u85-b01 +94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6-branchpoint +b19bc5aeaa099ac73ee8341e337a007180409593 icedtea-2.6.1 e45a07be1cac074dfbde6757f64b91f0608f30fb jdk7u85-b02 +25077ae8f6d2c512e74bfb3e5c1ed511b7c650de icedtea-2.6.2pre01 +1500c88d1b61914b3fbe7dfd8c521038bd95bde3 icedtea-2.6.2pre02 cce12560430861a962349343b61d3a9eb12c6571 jdk7u91-b00 5eaaa63440c4416cd9c03d586f72b3be8c7c73f8 jdk7u91-b01 +f40363c111917466319901436650f22f8403b749 icedtea-2.6.2 2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02 +c3cde6774003850aa6c44315c9c3e4dfdac69798 icedtea-2.6.3 b3c5ff648bcad305163b323ad15dde1b6234d501 jdk7u95-b00 +19d919ae5506a750e3a0bcc6bd176c66b7e1e65d icedtea-2.6.4 631da593499ee184ea8efb2bc5491e0d99ac636d jdk7u99-b00 +04d7046d2d41ae18c762fbdad7e114fdd55e2282 icedtea-2.6.5 +825fa447453ad85b3a6f11f87c5147b8b78fb3ab icedtea-2.6.6pre01 6e42747134be8a4a366d337da1fc84a847ad8381 jdk7u101-b00 +3022a3d80efd705e861b90cece4f6fdc73f6de97 icedtea-2.6.6 +b4a17ff67e26e5e64680ab68c398dbecc46ee7c4 icedtea-2.6.7pre01 14d0f4da4a74897fc3274f8f549f41544bb4625a jdk7u111-b00 9efa3fae3c278a7f48badec775d7f9b2d5320b6d jdk7u111-b01 +75297b84957ed87867b0863be1a895a0de76d994 icedtea-2.6.7 +6b87ff3af68f636e473e2254c8e9a8c36ca514a6 icedtea-2.6.8pre01 17b40d99ea3665de2bfffe163b68f2dfcf675cba jdk7u121-b00 +223f6c442d4987da3508893fb35e4419b33dc7f7 icedtea-2.6.8 +1d30f5a7723eeeb8092eed80d305fe6cdf530b1f icedtea-2.6.9pre01 95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00 +9fc0d63c2a741ad9567580ead69b9cbf220f968f icedtea-2.6.9 +ada095ab78a923f10b40935d6e3fa1a42dc2358a icedtea-2.6.10pre01 be8da42894af5f7d11b4bad83e166186f01ce1b4 jdk7u141-b00 22c5a6ca09e35b63baf51bad4cb3d8f0cf326705 jdk7u141-b01 56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02 +8edec8d2933aa575e7da2656b0fc4d8b904b1997 icedtea-2.6.10 +a8044a7634d086a85ac71b8674b432424606a85c icedtea-2.6.11pre01 75662a7ec1719b3133636d09bd078968579a55ab jdk7u151-b00 d0c7cea0660f7a8188a7b8c1f6d1a6c8d6388fb0 jdk7u151-b01 +809ae803d8ea9fd1af5cda606931959086dde30c icedtea-2.6.11 +9777e52ab513f7912e90433ccb6d7d6ecb7e0244 icedtea-2.6.12pre01 fc789043683d3cf424f97176bd77cf7abe5bd01a jdk7u161-b00 2965926dc5176c075e7a68c5d82bfd0ffa91cd5e jdk7u161-b01 +7fe1098f101e3bb5a2e5ed47ab0a596f4b74847a icedtea-2.6.12 66e04addced6cc25701d2f6c6477051279006a14 jdk7u171-b00 d07df83bf5755c518bb0acc65cd6a33da38014b5 jdk7u171-b01 ce3abb5889fb01808cab7489e83c1dc448743b70 jdk7u171-b02 +f96baf6b460751580465a599ed2fba0c912e4bad icedtea-2.6.13 +79d8447a461c7319969585c363649901b4c2773a icedtea-2.6.14pre01 205c34770f355f726055a716ecc8991dd3bbd8fd jdk7u181-b00 +6865c5a6ec36e80772ec47e14f7926b92053b551 jdk7u181-b01 +56142fb6814b3fbe81d580622583829976c6d08e icedtea-2.6.14 +592120da2a2b32c188d93212dd1929064e0723f0 icedtea-2.6.15pre01 diff -r 5559874a74ad -r 307eb3563046 .jcheck/conf --- a/.jcheck/conf Thu Apr 19 04:51:00 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 5559874a74ad -r 307eb3563046 agent/src/os/linux/Makefile --- a/agent/src/os/linux/Makefile Thu Apr 19 04:51:00 2018 +0100 +++ b/agent/src/os/linux/Makefile Fri Jun 29 17:43:42 2018 +0100 @@ -23,7 +23,12 @@ # ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) -GCC = gcc + +ifndef BUILD_GCC +BUILD_GCC = gcc +endif + +GCC = $(BUILD_GCC) JAVAH = ${JAVA_HOME}/bin/javah @@ -40,7 +45,7 @@ LIBS = -lthread_db -CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64 +CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64 LIBSA = $(ARCH)/libsaproc.so @@ -73,7 +78,7 @@ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS) test.o: test.c - $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c + $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c test: test.o $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS) diff -r 5559874a74ad -r 307eb3563046 agent/src/os/linux/elfmacros.h --- a/agent/src/os/linux/elfmacros.h Thu Apr 19 04:51:00 2018 +0100 +++ b/agent/src/os/linux/elfmacros.h Fri Jun 29 17:43:42 2018 +0100 @@ -33,6 +33,7 @@ #define ELF_NHDR Elf64_Nhdr #define ELF_DYN Elf64_Dyn #define ELF_ADDR Elf64_Addr +#define ELF_AUXV Elf64_auxv_t #define ELF_ST_TYPE ELF64_ST_TYPE @@ -45,6 +46,7 @@ #define ELF_NHDR Elf32_Nhdr #define ELF_DYN Elf32_Dyn #define ELF_ADDR Elf32_Addr +#define ELF_AUXV Elf32_auxv_t #define ELF_ST_TYPE ELF32_ST_TYPE diff -r 5559874a74ad -r 307eb3563046 agent/src/os/linux/libproc.h --- a/agent/src/os/linux/libproc.h Thu Apr 19 04:51:00 2018 +0100 +++ b/agent/src/os/linux/libproc.h Fri Jun 29 17:43:42 2018 +0100 @@ -34,7 +34,7 @@ #include "libproc_md.h" #endif -#include +#include /************************************************************************************ diff -r 5559874a74ad -r 307eb3563046 agent/src/os/linux/ps_core.c --- a/agent/src/os/linux/ps_core.c Thu Apr 19 04:51:00 2018 +0100 +++ b/agent/src/os/linux/ps_core.c Fri Jun 29 17:43:42 2018 +0100 @@ -629,6 +629,18 @@ if (notep->n_type == NT_PRSTATUS) { if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) return false; + } else if (notep->n_type == NT_AUXV) { + // Get first segment from entry point + ELF_AUXV *auxv = (ELF_AUXV *)descdata; + while (auxv->a_type != AT_NULL) { + if (auxv->a_type == AT_ENTRY) { + // Set entry point address to address of dynamic section. + // We will adjust it in read_exec_segments(). + ph->core->dynamic_addr = auxv->a_un.a_val; + break; + } + auxv++; + } } p = descdata + ROUNDUP(notep->n_descsz, 4); } @@ -811,7 +823,13 @@ // from PT_DYNAMIC we want to read address of first link_map addr case PT_DYNAMIC: { - ph->core->dynamic_addr = exec_php->p_vaddr; + if (exec_ehdr->e_type == ET_EXEC) { + ph->core->dynamic_addr = exec_php->p_vaddr; + } else { // ET_DYN + // dynamic_addr has entry point of executable. + // Thus we should substract it. + ph->core->dynamic_addr += exec_php->p_vaddr - exec_ehdr->e_entry; + } print_debug("address of _DYNAMIC is 0x%lx\n", ph->core->dynamic_addr); break; } @@ -1007,8 +1025,9 @@ goto err; } - if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || exec_ehdr.e_type != ET_EXEC) { - print_debug("executable file is not a valid ELF ET_EXEC file\n"); + if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || + ((exec_ehdr.e_type != ET_EXEC) && (exec_ehdr.e_type != ET_DYN))) { + print_debug("executable file is not a valid ELF file\n"); goto err; } diff -r 5559874a74ad -r 307eb3563046 agent/src/os/linux/ps_proc.c --- a/agent/src/os/linux/ps_proc.c Thu Apr 19 04:51:00 2018 +0100 +++ b/agent/src/os/linux/ps_proc.c Fri Jun 29 17:43:42 2018 +0100 @@ -263,7 +263,7 @@ static bool read_lib_info(struct ps_prochandle* ph) { char fname[32]; - char buf[256]; + char buf[PATH_MAX]; FILE *fp = NULL; sprintf(fname, "/proc/%d/maps", ph->pid); @@ -273,10 +273,52 @@ return false; } - while(fgets_no_cr(buf, 256, fp)){ - char * word[6]; - int nwords = split_n_str(buf, 6, word, ' ', '\0'); - if (nwords > 5 && find_lib(ph, word[5]) == false) { + while(fgets_no_cr(buf, PATH_MAX, fp)){ + char * word[7]; + int nwords = split_n_str(buf, 7, word, ' ', '\0'); + + if (nwords < 6) { + // not a shared library entry. ignore. + continue; + } + + if (word[5][0] == '[') { + // not a shared library entry. ignore. + if (strncmp(word[5],"[stack",6) == 0) { + continue; + } + if (strncmp(word[5],"[heap]",6) == 0) { + continue; + } + + // SA don't handle VDSO + if (strncmp(word[5],"[vdso]",6) == 0) { + continue; + } + if (strncmp(word[5],"[vsyscall]",6) == 0) { + continue; + } + } + + if (nwords > 6) { + // prelink altered mapfile when the program is running. + // Entries like one below have to be skipped + // /lib64/libc-2.15.so (deleted) + // SO name in entries like one below have to be stripped. + // /lib64/libpthread-2.15.so.#prelink#.EECVts + char *s = strstr(word[5],".#prelink#"); + if (s == NULL) { + // No prelink keyword. skip deleted library + print_debug("skip shared object %s deleted by prelink\n", word[5]); + continue; + } + + // Fall through + print_debug("rectifing shared object name %s changed by prelink\n", word[5]); + *s = 0; + } + + if (find_lib(ph, word[5]) == false) { intptr_t base; lib_info* lib; #ifdef _LP64 diff -r 5559874a74ad -r 307eb3563046 agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java --- a/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java Thu Apr 19 04:51:00 2018 +0100 +++ b/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java Fri Jun 29 17:43:42 2018 +0100 @@ -44,7 +44,7 @@ Type type = db.lookupType("PhaseCFG"); numBlocksField = new CIntField(type.getCIntegerField("_num_blocks"), 0); blocksField = type.getAddressField("_blocks"); - bbsField = type.getAddressField("_bbs"); + bbsField = type.getAddressField("_node_to_block_mapping"); brootField = type.getAddressField("_broot"); } diff -r 5559874a74ad -r 307eb3563046 make/bsd/Makefile --- a/make/bsd/Makefile Thu Apr 19 04:51:00 2018 +0100 +++ b/make/bsd/Makefile Fri Jun 29 17:43:42 2018 +0100 @@ -282,7 +282,23 @@ $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in - $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ +ifeq ($(ZERO_ARCHDEF),PPC) + ifndef LP64 + $(SED) 's/@ZERO_ARCHDEF@/-DPPC -DPPC32/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ + else + $(SED) 's/@ZERO_ARCHDEF@/-DPPC -DPPC64/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ + endif +else + ifeq ($(ZERO_ARCHDEF),PPC64) + $(SED) 's/@ZERO_ARCHDEF@/-DPPC -DPPC64/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ + else + ifeq ($(ZERO_ARCHDEF),PPC32) + $(SED) 's/@ZERO_ARCHDEF@/-DPPC -DPPC32/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ + else + $(SED) 's/@ZERO_ARCHDEF@/-D$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ + endif + endif +endif # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME diff -r 5559874a74ad -r 307eb3563046 make/bsd/makefiles/gcc.make --- a/make/bsd/makefiles/gcc.make Thu Apr 19 04:51:00 2018 +0100 +++ b/make/bsd/makefiles/gcc.make Fri Jun 29 17:43:42 2018 +0100 @@ -137,6 +137,20 @@ # Ineffecient 16-byte stack re-alignment on Darwin/IA32 ARCHFLAG/i486 += -mstackrealign endif +# gcc bug http://gcc.gnu.org/PR63341 in ppc code generation requires -fno-tree-vectorize for now +ARCHFLAG/ppc += -fno-tree-vectorize +ARCHFLAG/ppc64 += -fno-tree-vectorize +ifeq ($(TYPE),ZERO) + ifeq ($(ZERO_ARCHDEF),PPC) + ARCHFLAG/zero += -fno-tree-vectorize + endif + ifeq ($(ZERO_ARCHDEF),PPC32) + ARCHFLAG/zero += -fno-tree-vectorize + endif + ifeq ($(ZERO_ARCHDEF),PPC64) + ARCHFLAG/zero += -fno-tree-vectorize + endif +endif CFLAGS += $(ARCHFLAG) AOUT_FLAGS += $(ARCHFLAG) diff -r 5559874a74ad -r 307eb3563046 make/bsd/makefiles/vm.make --- a/make/bsd/makefiles/vm.make Thu Apr 19 04:51:00 2018 +0100 +++ b/make/bsd/makefiles/vm.make Fri Jun 29 17:43:42 2018 +0100 @@ -187,7 +187,7 @@ Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) Src_Dirs := $(Src_Dirs/$(TYPE)) -COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* +COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\* COMPILER1_SPECIFIC_FILES := c1_\* SHARK_SPECIFIC_FILES := shark ZERO_SPECIFIC_FILES := zero diff -r 5559874a74ad -r 307eb3563046 make/bsd/platform_zero.in --- a/make/bsd/platform_zero.in Thu Apr 19 04:51:00 2018 +0100 +++ b/make/bsd/platform_zero.in Fri Jun 29 17:43:42 2018 +0100 @@ -14,4 +14,4 @@ gnu_dis_arch = zero -sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D at ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO @ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" diff -r 5559874a74ad -r 307eb3563046 make/defs.make --- a/make/defs.make Thu Apr 19 04:51:00 2018 +0100 +++ b/make/defs.make Fri Jun 29 17:43:42 2018 +0100 @@ -270,7 +270,7 @@ # Use uname output for SRCARCH, but deal with platform differences. If ARCH # is not explicitly listed below, it is treated as x86. - SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero,$(ARCH))) + SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero aarch64,$(ARCH))) ARCH/ = x86 ARCH/sparc = sparc ARCH/sparc64= sparc @@ -281,6 +281,7 @@ ARCH/ppc = ppc ARCH/arm = arm ARCH/zero = zero + ARCH/aarch64 = aarch64 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 BUILDARCH = $(SRCARCH) @@ -303,11 +304,22 @@ BUILDARCH = ppc endif endif From andrew at icedtea.classpath.org Fri Jun 29 16:47:38 2018 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:47:38 +0000 Subject: /hg/release/icedtea7-forest-2.6/jdk: 10 new changesets Message-ID: changeset 3fa6e7c8dcde in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3fa6e7c8dcde author: andrew date: Thu Apr 19 18:49:49 2018 +0100 Bump to icedtea-2.6.14 changeset a17a9fd15b88 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a17a9fd15b88 author: mbalao date: Wed May 02 06:31:31 2018 +0100 8189123: More consistent classloading Reviewed-by: adinn, andrew changeset 18bac81b4778 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=18bac81b4778 author: ljiang date: Tue Mar 27 18:03:51 2018 -0700 8200314: JDK 8u171 l10n resource file update - msg drop 40 Reviewed-by: coffeys changeset 5687cff098b5 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5687cff098b5 author: andrew date: Wed May 09 17:41:51 2018 +0100 Added tag jdk7u181-b01 for changeset 18bac81b4778 changeset 581773232054 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=581773232054 author: andrew date: Thu May 17 02:55:38 2018 +0100 Merge jdk7u181-b01 changeset 742e02451a37 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=742e02451a37 author: andrew date: Thu May 24 04:03:50 2018 +0100 Added tag icedtea-2.6.14 for changeset 581773232054 changeset 07c30d3f55d0 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=07c30d3f55d0 author: andrew date: Tue Jun 19 03:30:02 2018 +0100 PR3606: jni_util.c does not import header file which declares getLastErrorString changeset 52fb4a409da5 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=52fb4a409da5 author: prr date: Fri Apr 17 12:32:46 2015 -0700 8075942, PR3605: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo Reviewed-by: flar, lbourges changeset 384dd407114d in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=384dd407114d author: andrew date: Fri Jun 29 17:43:17 2018 +0100 Bump to icedtea-2.6.15pre01 changeset 898472e83882 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=898472e83882 author: andrew date: Fri Jun 29 17:43:42 2018 +0100 Added tag icedtea-2.6.15pre01 for changeset 384dd407114d diffstat: .hgtags | 3 + make/jdk_generic_profile.sh | 2 +- src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties | 4 +- src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties | 2 +- src/share/classes/java/lang/ClassLoader.java | 5 + src/share/classes/sun/java2d/pisces/Dasher.java | 2 +- src/share/classes/sun/security/tools/keytool/Resources_de.java | 8 +- src/share/classes/sun/security/tools/policytool/Resources_sv.java | 4 +- src/share/classes/sun/security/util/Resources_sv.java | 4 +- src/share/native/common/jni_util.c | 3 +- test/java/awt/BasicStroke/DashStrokeTest.java | 69 ++++++++++ 11 files changed, 91 insertions(+), 15 deletions(-) diffs (237 lines): diff -r 88859cc294e1 -r 898472e83882 .hgtags --- a/.hgtags Thu Apr 19 17:55:33 2018 +0100 +++ b/.hgtags Fri Jun 29 17:43:42 2018 +0100 @@ -672,3 +672,6 @@ 68b6bb380175e4469e995a6c8a49a64a4c658cdc icedtea-2.6.13 7ae89263e2c362312ec38041f456b52a0bfddc30 icedtea-2.6.14pre01 9483a1259c9e24e766d449f085b015ef57736dd6 jdk7u181-b00 +18bac81b47784889754737181ff206995d36e97d jdk7u181-b01 +5817732320544e829dd476ad38127e8bf02190e5 icedtea-2.6.14 +384dd407114dfafab773e480bc034cd96cf99169 icedtea-2.6.15pre01 diff -r 88859cc294e1 -r 898472e83882 make/jdk_generic_profile.sh --- a/make/jdk_generic_profile.sh Thu Apr 19 17:55:33 2018 +0100 +++ b/make/jdk_generic_profile.sh Fri Jun 29 17:43:42 2018 +0100 @@ -672,7 +672,7 @@ # IcedTea versioning export ICEDTEA_NAME="IcedTea" -export PACKAGE_VERSION="2.6.14pre01" +export PACKAGE_VERSION="2.6.15pre01" export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}" echo "Building ${DERIVATIVE_ID}" diff -r 88859cc294e1 -r 898472e83882 src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties --- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties Fri Jun 29 17:43:42 2018 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2018, 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 @@ -122,7 +122,7 @@ crsreader.caldetected = En kalender har identifierats #CachedRowSetWriter exceptions -crswriter.connect = Kan inte uppr\u00E4tta n\u00E5gon anslutning +crswriter.connect = Kan inte uppr\u00E4tta anslutning crswriter.tname = writeData kan inte fastst\u00E4lla tabellnamnet crswriter.params1 = Parameterv\u00E4rde1: {0} crswriter.params2 = Parameterv\u00E4rde2: {0} diff -r 88859cc294e1 -r 898472e83882 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties --- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Fri Jun 29 17:43:42 2018 +0100 @@ -66,7 +66,7 @@ FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan f\u00F6r filval FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil -FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan +FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglista FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp f\u00F6r val av fil FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog diff -r 88859cc294e1 -r 898472e83882 src/share/classes/java/lang/ClassLoader.java --- a/src/share/classes/java/lang/ClassLoader.java Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/classes/java/lang/ClassLoader.java Fri Jun 29 17:43:42 2018 +0100 @@ -188,6 +188,11 @@ // must be added *after* it. private final ClassLoader parent; + // Used by ClassLoaderDependencies native class. This attribute is + // expected to be the 2nd instance attribute of ClassLoader class, + // according to java_lang_ClassLoader native class. + private final Object[] dependencies = new Object[2]; + /** * Encapsulates the set of parallel capable loader types. */ diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/java2d/pisces/Dasher.java --- a/src/share/classes/sun/java2d/pisces/Dasher.java Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/classes/sun/java2d/pisces/Dasher.java Fri Jun 29 17:43:42 2018 +0100 @@ -146,7 +146,7 @@ if (dashOn) { if (starting) { firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer, - firstSegidx, type - 2); + firstSegidx, type - 2 + 1); firstSegmentsBuffer[firstSegidx++] = type; System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2); firstSegidx += type - 2; diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/security/tools/keytool/Resources_de.java --- a/src/share/classes/sun/security/tools/keytool/Resources_de.java Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/classes/sun/security/tools/keytool/Resources_de.java Fri Jun 29 17:43:42 2018 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, 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 @@ -423,11 +423,11 @@ // 8171319: keytool should print out warnings when reading or // generating cert/cert req using weak algorithms - {"the.certificate.request", "Die Zertifikatsanforderung"}, + {"the.certificate.request", "Die Zertifikatanforderung"}, {"the.issuer", "Der Aussteller"}, {"the.generated.certificate", "Das generierte Zertifikat"}, {"the.generated.crl", "Die generierte CRL"}, - {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"}, + {"the.generated.certificate.request", "Die generierte Zertifikatanforderung"}, {"the.certificate", "Das Zertifikat"}, {"the.crl", "Die CRL"}, {"the.tsa.certificate", "Das TSA-Zertifikat"}, @@ -442,7 +442,7 @@ {".PATTERN.printX509Cert.with.weak", "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatfingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nSignaturalgorithmusname: {8}\nAlgorithmus des Public Key von Betreff: {9}\nVersion: {10}"}, {"PKCS.10.with.weak", - "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"}, + "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"}, {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"}, {"whose.sigalg.risk", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."}, {"whose.key.risk", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."}, diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/security/tools/policytool/Resources_sv.java --- a/src/share/classes/sun/security/tools/policytool/Resources_sv.java Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/classes/sun/security/tools/policytool/Resources_sv.java Fri Jun 29 17:43:42 2018 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, 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 @@ -111,7 +111,7 @@ "Kan inte specificera identitetshavare utan namn"}, {"Permission.and.Target.Name.must.have.a.value", "Beh\u00F6righet och m\u00E5lnamn m\u00E5ste ha ett v\u00E4rde"}, - {"Remove.this.Policy.Entry.", "Vill du ta bort den h\u00E4r policyposten?"}, + {"Remove.this.Policy.Entry.", "Vill du ta bort policyposten?"}, {"Overwrite.File", "Skriv \u00F6ver fil"}, {"Policy.successfully.written.to.filename", "Policy har skrivits till {0}"}, diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/security/util/Resources_sv.java --- a/src/share/classes/sun/security/util/Resources_sv.java Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/classes/sun/security/util/Resources_sv.java Fri Jun 29 17:43:42 2018 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, 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 @@ -36,7 +36,7 @@ // javax.security.auth.PrivateCredentialPermission {"invalid.null.input.s.", "ogiltiga null-indata"}, - {"actions.can.only.be.read.", "funktioner kan endast 'l\u00E4sas'"}, + {"actions.can.only.be.read.", "\u00E5tg\u00E4rder kan endast 'l\u00E4sas'"}, {"permission.name.name.syntax.invalid.", "syntaxen f\u00F6r beh\u00F6righetsnamnet [{0}] \u00E4r ogiltig: "}, {"Credential.Class.not.followed.by.a.Principal.Class.and.Name", diff -r 88859cc294e1 -r 898472e83882 src/share/native/common/jni_util.c --- a/src/share/native/common/jni_util.c Thu Apr 19 17:55:33 2018 +0100 +++ b/src/share/native/common/jni_util.c Fri Jun 29 17:43:42 2018 +0100 @@ -27,8 +27,7 @@ #include #include "jvm.h" -#include "jni.h" -#include "jni_util.h" +#include "io_util.h" /* Due to a bug in the win32 C runtime library strings * such as "z:" need to be appended with a "." so we diff -r 88859cc294e1 -r 898472e83882 test/java/awt/BasicStroke/DashStrokeTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/BasicStroke/DashStrokeTest.java Fri Jun 29 17:43:42 2018 +0100 @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2015, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + * @test + * @bug 8075942 + * @summary test there is no exception rendering a dashed stroke + * @run DashStrokeTest + * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine + */ + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Stroke; +import java.awt.geom.GeneralPath; +import java.awt.image.BufferedImage; + + +public class DashStrokeTest { + + public static void main(String[] args) { + + GeneralPath shape = new GeneralPath(); + int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0}; + double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733}; + double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10}; + shape.moveTo(xpoints[0], ypoints[0]); + for (int i = 1; i < pointTypes.length; i++) { + if (pointTypes[i] == 1 && i < pointTypes.length - 1) { + shape.quadTo(xpoints[i], ypoints[i], + xpoints[i + 1], ypoints[i + 1]); + } else { + shape.lineTo(xpoints[i], ypoints[i]); + } + } + + BufferedImage image = new + BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB); + Graphics2D g2 = image.createGraphics(); + + Color color = new Color(124, 0, 124, 255); + g2.setColor(color); + Stroke stroke = new BasicStroke(1.0f, + BasicStroke.CAP_BUTT, + BasicStroke.JOIN_BEVEL, + 10.0f, new float[] {9, 6}, 0.0f); + g2.setStroke(stroke); + g2.draw(shape); + } +} From bugzilla-daemon at icedtea.classpath.org Fri Jun 29 16:48:00 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:48:00 +0000 Subject: [Bug 3606] [IcedTea7] jni_util.c does not import header file which declares getLastErrorString In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3606 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=07c30d3f55d0 author: andrew date: Tue Jun 19 03:30:02 2018 +0100 PR3606: jni_util.c does not import header file which declares getLastErrorString -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Jun 29 16:48:09 2018 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 29 Jun 2018 16:48:09 +0000 Subject: [Bug 3605] [IcedTea7] Backport "8075942: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo" In-Reply-To: References: Message-ID: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3605 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=52fb4a409da5 author: prr date: Fri Apr 17 12:32:46 2015 -0700 8075942, PR3605: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo Reviewed-by: flar, lbourges -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: