Commit Graph

1931 Commits

Author SHA1 Message Date
Erik Trimble
6083a2c670 Merge 2010-12-16 20:48:11 -08:00
Erik Trimble
c3bc769347 Merge 2010-12-16 20:35:33 -08:00
Erik Trimble
070f8fc0a1 Merge 2010-12-16 20:32:43 -08:00
Christine Lu
1c1adc7c03 Added tag jdk7-b122 for changeset c601f7238c18 2010-12-16 18:17:52 -08:00
David Holmes
156ee8c453 7003707: need to remove (some) system include files from the HotSpot header files
Move socket_available into os_linux.cpp to avoid inclusion of ioctl.h in os_linux.inline.hpp

Reviewed-by: coleenp, stefank, ikrylov
2010-12-16 20:57:03 -05:00
Y. Srinivas Ramakrishna
7c3fda39e6 Merge 2010-12-16 12:56:51 -08:00
Y. Srinivas Ramakrishna
771994b0dc Merge 2010-12-16 09:14:34 -08:00
Coleen Phillimore
b2bc7d218f Merge 2010-12-16 09:31:55 -05:00
Igor Veresov
a4b8804ae0 Merge 2010-12-15 23:38:10 -08:00
Igor Veresov
3ccd57dac4 7007229: Fix warnings with VS2010 in compressedStream.cpp
An interference between a fix for 6993125 and disabled optimization in compressedStream.cpp produces a warning with VS2010. Disable the warning for the code fragment for which the optimizations are disabled.

Reviewed-by: kvn
2010-12-15 20:43:36 -08:00
Staffan Larsen
5ba47f538b Merge 2010-12-15 08:03:54 -08:00
Staffan Larsen
c299b4709f 7006354: Updates to Visual Studio project creation and development launcher
Updates to Visual Studio project creation and development launcher

Reviewed-by: stefank, coleenp
2010-12-15 07:11:31 -08:00
Stefan Karlsson
c7842c2550 7006659: temporary adlc files are added to the build variables
Don't recurse into sub-directories when looking for source files.

Reviewed-by: never, brutisso
2010-12-15 05:43:54 -08:00
Antonios Printezis
727333a1a3 7000559: G1: assertion failure !outer || (full_collections_started == _full_collections_completed + 1)
The concurrent marking thread can complete its operation and increment the full GC counter during a Full GC. This causes the nesting of increments to the start and end of Full GCs that we are expecting to be wrong. the fix is for the marking thread to join the suspendible thread set before incrementing the counter so that it's blocked until the Full GC (or any other safepoint) is finished. The change also includes some minor code cleanup (I renamed a parameter).

Reviewed-by: brutisso, ysr
2010-12-14 16:19:44 -05:00
Coleen Phillimore
18324204ef 7006471: fix for 6988439 crashes when pending list lock is null
Missing null check in owns_pending_list_lock() because this can be called before pending_list_lock is initialized.

Reviewed-by: never, kvn
2010-12-14 15:10:52 -05:00
Tom Rodriguez
a5f501c021 7004940: CTW: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG
Reviewed-by: kvn, twisti
2010-12-13 22:41:03 -08:00
Coleen Phillimore
d2481f01f0 Merge 2010-12-13 14:46:51 -08:00
Zhengyu Gu
86f7ad735d Merge 2010-12-11 13:46:36 -05:00
Zhengyu Gu
61a4658b22 7003748: Decode C stack frames when symbols are presented (PhoneHome project)
Implemented in-process C native stack frame decoding when symbols are available.

Reviewed-by: coleenp, never
2010-12-11 13:20:56 -05:00
Erik Trimble
72a4a57a9e 7006221: Bump the HS20 build number to 04
Update the HS20 build number to 04

Reviewed-by: jcoomes
2010-12-10 18:05:39 -08:00
Erik Trimble
3ba0ee979e Merge 2010-12-10 17:59:46 -08:00
Erik Trimble
3d041302d0 Merge 2010-12-10 15:46:59 -08:00
Vladimir Kozlov
19a01fed97 6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this))
Add another ResourceObj debug field to distinguish garbage

Reviewed-by: dholmes, coleenp
2010-12-10 14:14:02 -08:00
Coleen Phillimore
aa521ed9cd 6988439: Parallel Class Loading test deadlock involving MethodData_lock and Pending List Lock
Don't acquire methodData_lock while holding pending list lock

Reviewed-by: kvn, never, ysr
2010-12-10 12:13:03 -05:00
Y. Srinivas Ramakrishna
874098b1c6 Merge 2010-12-09 21:47:58 -08:00
David Katleman
06759914a2 Added tag jdk7-b121 for changeset 355804dc2e5e 2010-12-09 21:25:25 -08:00
David Holmes
83c72a434a 7005007: Refine use of ALT_COMPILER_PATH to avoid conflict with JPRT usage
Check for CROSS_COMPILE_ARCH being set as an indicator to use ALT_COMPILER_PATH

Reviewed-by: acorn, ohair
2010-12-09 20:12:06 -05:00
Keith McGuigan
de27a1608c 7004582: Add GetThisObject() function to JVMTI 1.2
Add 'GetThisObject' function

Reviewed-by: never, coleenp
2010-12-09 15:04:26 -05:00
Y. Srinivas Ramakrishna
8baafdfd45 7005259: CMS: BubbleUpRef asserts referent(obj)->is_oop() failed: Enqueued a bad referent
Relaxed the assert by allowing NULL referents when discovery may be concurrent.

Reviewed-by: johnc, jcoomes
2010-12-09 09:22:57 -08:00
Dmitry Samersoff
d344b51209 6989076: JVM crashes in klassItable::initialize_itable_for_interface
Hotspot should check protection attribute besides the name and signature of the method when constructing vtable.

Reviewed-by: dcubed
2010-12-09 17:53:22 +03:00
Igor Veresov
a9bee9ec34 Merge 2010-12-08 17:50:49 -08:00
Kevin Walls
03a1ccfef2 7003789: PTRACE_GETREGS problems with SA on Linux
Ifdef definitions for PTRACE_GETREGS_REQ clarified

Reviewed-by: dholmes
2010-12-08 04:50:35 -08:00
Igor Veresov
eafb22164b 7005241: C1: SEGV in java.util.concurrent.LinkedTransferQueue.xfer() with compressed oops
Implementation of the CAS primitive for x64 compressed oops was incorrect. It kills rscratch2 register (r11), which is allocatable in C1. Also, we don't need to restore cmpval as it's never used after that, so we need only one temporary register, which can be scratch1.

Reviewed-by: kvn, never
2010-12-08 02:36:36 -08:00
Y. Srinivas Ramakrishna
544b475fc5 7001033: assert(gch->gc_cause() == GCCause::_scavenge_alot || !gch->incremental_collection_failed())
7002546: regression on SpecJbb2005 on 7b118 comparing to 7b117 on small heaps

Relaxed assertion checking related to incremental_collection_failed flag to allow for ExplicitGCInvokesConcurrent behaviour where we do not want a failing scavenge to bail to a stop-world collection. Parameterized incremental_collection_will_fail() so we can selectively use, or not use, as appropriate, the statistical prediction at specific use sites. This essentially reverts the scavenge bail-out logic to what it was prior to some recent changes that had inadvertently started using the statistical prediction which can be noisy in the presence of bursty loads. Added some associated verbose non-product debugging messages.

Reviewed-by: johnc, tonyp
2010-12-07 21:55:53 -08:00
John Cuthbertson
4aaa89ea60 Merge 2010-12-07 16:44:34 -08:00
John Cuthbertson
8f4579fe60 6994628: G1: Test gc/gctests/FinalizeTest05 fails (one live object is finalized)
The Solaris Studio 12 update 1 C++ compiler was incorrectly re-ordering the reads of an object's mark word in oopDesc::forward_to_atomic(). This opened a small window where one thread could execute the successful CAS path even though another thread had already successfully forwarded the object. This could result in an object being copied twice. The code in oopDesc::forward_to_atomic() was changed to read the mark word once.

Reviewed-by: ysr, tonyp
2010-12-07 16:18:45 -08:00
Antonios Printezis
edcfaf0f84 6994056: G1: when GC locker is active, extend the Eden instead of allocating into the old gen
Allow the eden to the expanded up to a point when the GC locker is active.

Reviewed-by: jwilhelm, johnc, ysr, jcoomes
2010-12-07 16:47:42 -05:00
Vladimir Kozlov
797fb02b41 7004925: CTW: assert(nbits == 32 || -(1 << nbits-1) <= x && x < ( 1 << nbits-1)) failed: value out of range
Set offset in register if it does not fit 13 bits.

Reviewed-by: iveresov
2010-12-07 11:00:02 -08:00
Staffan Larsen
1765b0fbf0 6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
Tag allocated memory with a magic value and verify when releasing.

Reviewed-by: phh, stefank
2010-12-07 03:15:45 -08:00
Keith McGuigan
dd62e29b29 7003782: Update JVMTI version to 1.2 for jdk7
Update minor version to 1.2 for jdk7

Reviewed-by: phh, dcubed
2010-12-06 20:21:15 -05:00
Coleen Phillimore
faf320aede Merge 2010-12-06 15:37:00 -05:00
Volker Simonis
df6c2c2e63 6704010: Internal Error (src/share/vm/interpreter/interpreterRuntime.cpp:1106)
Fixed a race condition in the assertion caused by an unguarded, concurrent access to a GrowableArray object.

Reviewed-by: coleenp, dholmes, dsamersoff
2010-12-04 00:09:05 -05:00
Kelly O'Hair
7e995b2d2b Merge 2010-12-03 19:44:29 -08:00
John R Rose
cc7c58e166 7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
Reviewed-by: twisti
2010-12-03 15:53:57 -08:00
Tom Rodriguez
f74039fd41 7004530: casx used for 32 bit cas after 7003554
Reviewed-by: kvn, iveresov
2010-12-03 12:14:33 -08:00
Erik Trimble
f5a7f6d606 Added tag hs20-b03 for changeset a683e80b9ca8 2010-12-03 09:44:09 -08:00
Christian Thalinger
bd6731ae92 7003798: test/compiler/6991596 fails with true != false
The test of 6991596 fails on SPARCV9.

Reviewed-by: kvn, never, jrose
2010-12-03 06:14:37 -08:00
Christian Thalinger
ffaadcecea 6961690: load oops from constant table on SPARC
Oops should be loaded from the constant table of an nmethod instead of materializing them with a long code sequence.

Reviewed-by: never, kvn
2010-12-03 01:34:31 -08:00
Christine Lu
636b550f8c Added tag jdk7-b120 for changeset 6df7c2b3dbea 2010-12-02 19:04:00 -08:00
Igor Veresov
ab725dba1d 7003554: (tiered) assert(is_null_object() || handle() != NULL) failed: cannot embed null pointer
C1 with profiling doesn't check whether the MDO has been really allocated, which can silently fail if the perm gen is full. The solution is to check if the allocation failed and bailout out of inlining or compilation.

Reviewed-by: kvn, never
2010-12-02 17:21:12 -08:00