/hg/release/icedtea7-forest-2.5/hotspot: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Sep 2 04:20:43 UTC 2014
changeset e56036fb0f9e in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=e56036fb0f9e
author: andrew
date: Thu Aug 28 15:26:22 2014 +0100
RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix for PPC32)
Contributed-by: chphilli at redhat.com
changeset c7d38df7983b in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=c7d38df7983b
author: andrew
date: Tue Aug 26 17:14:48 2014 +0100
PR1948: Only try and symlink debuginfo if STRIP_POLICY is other than no_strip
changeset 2266438ca53f in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=2266438ca53f
author: andrew
date: Wed Aug 27 19:47:02 2014 +0100
PR1948: Fix indenting
changeset 4ad43b271fd4 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=4ad43b271fd4
author: hseigel
date: Tue Aug 05 23:10:45 2014 -0400
8051012: Regression in verifier for <init> method call from inside of a branch
Summary: Fix stackmap matching for branches.
Reviewed-by: coleenp, lfoltan, acorn
changeset 51c1c024f887 in /hg/release/icedtea7-forest-2.5/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot?cmd=changeset;node=51c1c024f887
author: andrew
date: Fri Aug 29 21:08:29 2014 +0100
Added tag icedtea-2.5.2 for changeset 4ad43b271fd4
diffstat:
.hgtags | 1 +
make/linux/makefiles/vm.make | 32 ++++++++++++++++----------------
src/os/linux/vm/os_linux.cpp | 10 +++++++++-
src/share/vm/classfile/stackMapTable.cpp | 23 +++++++++++------------
src/share/vm/classfile/stackMapTable.hpp | 6 +++---
src/share/vm/classfile/verifier.cpp | 13 ++-----------
src/share/vm/classfile/verifier.hpp | 16 ----------------
7 files changed, 42 insertions(+), 59 deletions(-)
diffs (262 lines):
diff -r f0d8ef4d9f93 -r 51c1c024f887 .hgtags
--- a/.hgtags Wed Aug 13 15:49:58 2014 +0100
+++ b/.hgtags Fri Aug 29 21:08:29 2014 +0100
@@ -708,3 +708,4 @@
d006213be74730453cf5c3ce31f1d1d505334419 jdk7u65-b18
1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b19
02066294d005e81a81d3a01ec549716ebcc65723 icedtea-2.5.1
+4ad43b271fd439317ec422b5ea35ea3483d40922 icedtea-2.5.2
diff -r f0d8ef4d9f93 -r 51c1c024f887 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make Wed Aug 13 15:49:58 2014 +0100
+++ b/make/linux/makefiles/vm.make Fri Aug 29 21:08:29 2014 +0100
@@ -355,28 +355,28 @@
fi \
}
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifneq ($(STRIP_POLICY),no_strip)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
- endif
- ifeq ($(STRIP_POLICY),all_strip)
+ endif
+ ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
$(QUIETLY) $(STRIP) -g $@
- # implied else here is no stripping at all
- endif
- endif
- endif
- $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- ifneq ($(STRIP_POLICY),no_strip)
- $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
$(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
[ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
- endif
- endif
+ endif
+ endif
+endif
DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
diff -r f0d8ef4d9f93 -r 51c1c024f887 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp Wed Aug 13 15:49:58 2014 +0100
+++ b/src/os/linux/vm/os_linux.cpp Fri Aug 29 21:08:29 2014 +0100
@@ -4843,6 +4843,7 @@
pthread_mutex_init(&dl_mutex, NULL);
+NOT_ZERO (
// If the pagesize of the VM is greater than 8K determine the appropriate
// number of initial guard pages. The user can change this with the
// command line arguments, if needed.
@@ -4851,6 +4852,7 @@
StackRedPages = 1;
StackShadowPages = round_to((StackShadowPages*Linux::vm_default_page_size()), vm_page_size()) / vm_page_size();
}
+ )
}
// To install functions for atexit system call
@@ -4903,10 +4905,16 @@
// size. Add a page for compiler2 recursion in main thread.
// Add in 2*BytesPerWord times page size to account for VM stack during
// class initialization depending on 32 or 64 bit VM.
+NOT_ZERO (
os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
(size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
(2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
-
+ )
+ZERO_ONLY (
+ os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
+ (size_t)(StackYellowPages+StackRedPages+StackShadowPages+
+ 2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::page_size());
+ )
size_t threadStackSizeInBytes = ThreadStackSize * K;
if (threadStackSizeInBytes != 0 &&
threadStackSizeInBytes < os::Linux::min_stack_allowed) {
diff -r f0d8ef4d9f93 -r 51c1c024f887 src/share/vm/classfile/stackMapTable.cpp
--- a/src/share/vm/classfile/stackMapTable.cpp Wed Aug 13 15:49:58 2014 +0100
+++ b/src/share/vm/classfile/stackMapTable.cpp Fri Aug 29 21:08:29 2014 +0100
@@ -70,24 +70,26 @@
bool StackMapTable::match_stackmap(
StackMapFrame* frame, int32_t target,
- bool match, bool update, ErrorContext* ctx, TRAPS) const {
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
int index = get_index_from_offset(target);
- return match_stackmap(frame, target, index, match, update, ctx, THREAD);
+ return match_stackmap(frame, target, index, match, update, handler, ctx, THREAD);
}
// Match and/or update current_frame to the frame in stackmap table with
// specified offset and frame index. Return true if the two frames match.
+// handler is true if the frame in stackmap_table is for an exception handler.
//
-// The values of match and update are: _match__update_
+// The values of match and update are: _match__update__handler
//
-// checking a branch target/exception handler: true false
+// checking a branch target: true false false
+// checking an exception handler: true false true
// linear bytecode verification following an
-// unconditional branch: false true
+// unconditional branch: false true false
// linear bytecode verification not following an
-// unconditional branch: true true
+// unconditional branch: true true false
bool StackMapTable::match_stackmap(
StackMapFrame* frame, int32_t target, int32_t frame_index,
- bool match, bool update, ErrorContext* ctx, TRAPS) const {
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
if (frame_index < 0 || frame_index >= _frame_count) {
*ctx = ErrorContext::missing_stackmap(frame->offset());
frame->verifier()->verify_error(
@@ -98,11 +100,9 @@
StackMapFrame *stackmap_frame = _frame_array[frame_index];
bool result = true;
if (match) {
- // when checking handler target, match == true && update == false
- bool is_exception_handler = !update;
// Has direct control flow from last instruction, need to match the two
// frames.
- result = frame->is_assignable_to(stackmap_frame, is_exception_handler,
+ result = frame->is_assignable_to(stackmap_frame, handler,
ctx, CHECK_VERIFY_(frame->verifier(), result));
}
if (update) {
@@ -126,7 +126,7 @@
StackMapFrame* frame, int32_t target, TRAPS) const {
ErrorContext ctx;
bool match = match_stackmap(
- frame, target, true, false, &ctx, CHECK_VERIFY(frame->verifier()));
+ frame, target, true, false, false, &ctx, CHECK_VERIFY(frame->verifier()));
if (!match || (target < 0 || target >= _code_length)) {
frame->verifier()->verify_error(ctx,
"Inconsistent stackmap frames at branch target %d", target);
@@ -134,7 +134,6 @@
}
// check if uninitialized objects exist on backward branches
check_new_object(frame, target, CHECK_VERIFY(frame->verifier()));
- frame->verifier()->update_furthest_jump(target);
}
void StackMapTable::check_new_object(
diff -r f0d8ef4d9f93 -r 51c1c024f887 src/share/vm/classfile/stackMapTable.hpp
--- a/src/share/vm/classfile/stackMapTable.hpp Wed Aug 13 15:49:58 2014 +0100
+++ b/src/share/vm/classfile/stackMapTable.hpp Fri Aug 29 21:08:29 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -74,12 +74,12 @@
// specified offset. Return true if the two frames match.
bool match_stackmap(
StackMapFrame* current_frame, int32_t offset,
- bool match, bool update, ErrorContext* ctx, TRAPS) const;
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
// Match and/or update current_frame to the frame in stackmap table with
// specified offset and frame index. Return true if the two frames match.
bool match_stackmap(
StackMapFrame* current_frame, int32_t offset, int32_t frame_index,
- bool match, bool update, ErrorContext* ctx, TRAPS) const;
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
// Check jump instructions. Make sure there are no uninitialized
// instances on backward branch.
diff -r f0d8ef4d9f93 -r 51c1c024f887 src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp Wed Aug 13 15:49:58 2014 +0100
+++ b/src/share/vm/classfile/verifier.cpp Fri Aug 29 21:08:29 2014 +0100
@@ -630,8 +630,6 @@
// flow from current instruction to the next
// instruction in sequence
- set_furthest_jump(0);
-
Bytecodes::Code opcode;
while (!bcs.is_last_bytecode()) {
// Check for recursive re-verification before each bytecode.
@@ -1788,7 +1786,7 @@
// If matched, current_frame will be updated by this method.
bool matches = stackmap_table->match_stackmap(
current_frame, this_offset, stackmap_index,
- !no_control_flow, true, &ctx, CHECK_VERIFY_(this, 0));
+ !no_control_flow, true, false, &ctx, CHECK_VERIFY_(this, 0));
if (!matches) {
// report type error
verify_error(ctx, "Instruction type does not match stack map");
@@ -1835,7 +1833,7 @@
}
ErrorContext ctx;
bool matches = stackmap_table->match_stackmap(
- new_frame, handler_pc, true, false, &ctx, CHECK_VERIFY(this));
+ new_frame, handler_pc, true, false, true, &ctx, CHECK_VERIFY(this));
if (!matches) {
verify_error(ctx, "Stack map does not match the one at "
"exception handler %d", handler_pc);
@@ -2243,13 +2241,6 @@
return;
}
- // Make sure that this call is not jumped over.
- if (bci < furthest_jump()) {
- verify_error(ErrorContext::bad_code(bci),
- "Bad <init> method call from inside of a branch");
- return;
- }
-
// Make sure that this call is not done from within a TRY block because
// that can result in returning an incomplete object. Simply checking
// (bci >= start_pc) also ensures that this call is not done after a TRY
diff -r f0d8ef4d9f93 -r 51c1c024f887 src/share/vm/classfile/verifier.hpp
--- a/src/share/vm/classfile/verifier.hpp Wed Aug 13 15:49:58 2014 +0100
+++ b/src/share/vm/classfile/verifier.hpp Fri Aug 29 21:08:29 2014 +0100
@@ -256,9 +256,6 @@
ErrorContext _error_context; // contains information about an error
- // Used to detect illegal jumps over calls to super() and this() in ctors.
- int32_t _furthest_jump;
-
void verify_method(methodHandle method, TRAPS);
char* generate_code_data(methodHandle m, u4 code_length, TRAPS);
void verify_exception_handler_table(u4 code_length, char* code_data,
@@ -402,19 +399,6 @@
TypeOrigin ref_ctx(const char* str, TRAPS);
- // Keep track of the furthest branch done in a method to make sure that
- // there are no branches over calls to super() or this() from inside of
- // a constructor.
- int32_t furthest_jump() { return _furthest_jump; }
-
- void set_furthest_jump(int32_t target) {
- _furthest_jump = target;
- }
-
- void update_furthest_jump(int32_t target) {
- if (target > _furthest_jump) _furthest_jump = target;
- }
-
};
inline int ClassVerifier::change_sig_to_verificationType(
More information about the distro-pkg-dev
mailing list