Tom Rodriguez
1022ea2299
Merge
2010-10-18 15:43:29 -07:00
Tom Rodriguez
daa052114f
Merge
2010-10-18 09:33:24 -07:00
Christian Thalinger
14d9ac3169
6991596: JSR 292 unimplemented adapter_opt_i2i and adapter_opt_l2i on SPARC
...
Reviewed-by: kvn, jrose, dsamersoff
2010-10-18 01:54:24 -07:00
Antonios Printezis
0c660e1f60
6991377: G1: race between concurrent refinement and humongous object allocation
...
There is a race between the concurrent refinement threads and the humongous object allocation that can cause the concurrent refinement threads to corrupt the part of the BOT that it is being initialized by the humongous object allocation operation. The solution is to do the humongous object allocation in careful steps to ensure that the concurrent refinement threads always have a consistent view over the BOT, region contents, and top. The fix includes some very minor tidying up in sparsePRT.
Reviewed-by: jcoomes, johnc, ysr
2010-10-16 17:12:19 -04:00
John Cuthbertson
f6acb9efb0
6988458: G1: assert(mr.end() <= _cm->finger()) failed: otherwise the region shouldn't be on the stack
...
The changes from 6941395 did not clear the CMTask::_aborted_region fields when concurrent marking aborted because of overflow. As a result, the next time around we could see a memory region whose start address was above the global finger and the assertion tripped. Moved the clearing of the aborted regions to ConcurrentMark::clear_marking_state, which is executed on all of the exit paths.
Reviewed-by: tonyp, ysr, jmasa
2010-10-18 15:01:41 -07:00
Antonios Printezis
0c9bfb6003
6992189: G1: inconsistent base used in sparse rem set iterator
...
The remembered set iterator for sparse tables incorrectly assumes that index 0 corresponds to the bottom of the heap, not address 0 as it is the case.
Reviewed-by: ysr, jmasa
2010-10-15 17:26:56 -04:00
Tom Rodriguez
e4f08bc195
6992477: fix for 6991512 broke sparc barriers
...
Reviewed-by: kvn, iveresov
2010-10-15 14:21:11 -07:00
Karen Kinnear
4af336814e
Merge
2010-10-15 15:12:04 -04:00
Roland Westrelin
4bf36a476f
Merge
2010-10-15 02:59:48 -07:00
Roland Westrelin
e1a504b343
6991577: add IfOp optimization to C1
...
Ifop optimization for c1
Reviewed-by: never, phh, iveresov
2010-10-15 09:38:20 +02:00
Christine Lu
c37a3a68ef
Added tag jdk7-b114 for changeset 21dec68c50e9
2010-10-14 19:24:57 -07:00
Erik Trimble
daea1b7ef4
6992267: Bump the HS20 build number to 02
...
Update the HS20 build number to 02
Reviewed-by: jcoomes
2010-10-14 16:05:59 -07:00
Erik Trimble
f589bf7945
Merge
2010-10-14 15:52:41 -07:00
John Coomes
add5d46008
Merge
2010-10-14 11:57:48 -07:00
Vladimir Kozlov
ec8fa4caa2
Merge
2010-10-14 10:46:38 -07:00
Antonios Printezis
e79a62412f
6990359: G1: don't push a stolen entry on the taskqueue, deal with it directly
...
When an entry is stolen, don't push it on the task queue but process it directly.
Reviewed-by: iveresov, ysr, jcoomes
2010-10-14 10:38:14 -04:00
Roland Westrelin
225a3b0eb8
Merge
2010-10-13 15:38:14 -07:00
Christian Thalinger
c225b71d63
Merge
2010-10-13 13:31:30 -07:00
Karen Kinnear
7d2a7e7452
Merge
2010-10-13 11:46:46 -04:00
Roland Westrelin
08e2ead403
6991211: assert failure on sparc: "can not have caller-save register operands at calls"
...
Fixes sparc only assert failure following 6972540
Reviewed-by: never
2010-10-13 10:29:31 +02:00
Christian Thalinger
98e9ecf9da
6987555: JSR 292 unboxing to a boolean value fails on big-endian SPARC
...
Reviewed-by: never, jrose
2010-10-13 01:19:43 -07:00
Igor Veresov
28a13e88e7
6991512: G1 barriers fail with 64bit C1
...
Fix compare-and-swap intrinsic problem with G1 post-barriers and issue with branch ranges in G1 stubs on sparc
Reviewed-by: never, kvn
2010-10-12 23:51:20 -07:00
John Coomes
d85b042fca
6989448: G1: refactor and simplify G1ParScanThreadState
...
Reviewed-by: iveresov, tonyp
2010-10-12 11:29:45 -07:00
John Cuthbertson
02bad20969
6971296: G1: simplify G1RemSet class hierarchy
...
Remove G1RemSet base class and StupidG1RemSet class; rename HRInto_G1RemSet to just G1RemSet.
Reviewed-by: ysr, tonyp
2010-10-12 09:36:48 -07:00
Keith McGuigan
da95f5319e
6392697
: Additional flag needed to supress Hotspot warning messages
...
Apply PrintJvmWarnings flag to all warnings
Reviewed-by: coleenp, phh
2010-10-12 10:57:33 -04:00
Christian Thalinger
e870866699
6991065: missed a review comment in 6829194
...
Reviewed-by: kvn
2010-10-12 02:21:06 -07:00
Christian Thalinger
0e4ed251b8
6829194: JSR 292 needs to support compressed oops
...
Reviewed-by: kvn, jrose
2010-10-11 04:18:58 -07:00
John Coomes
cdc9022728
Merge
2010-10-08 09:29:09 -07:00
Gary Benson
a10ec19a4d
6990549: Zero and Shark fixes after 6978355 and 6953144
...
Reviewed-by: twisti
2010-10-08 02:42:17 -07:00
Tom Rodriguez
39d16839d3
6980792: Crash "exception happened outside interpreter, nmethods and vtable stubs (1)"
...
Reviewed-by: kvn
2010-10-07 21:40:55 -07:00
Christine Lu
b705fe7b12
Added tag jdk7-b113 for changeset 4fb06c9f1ce0
2010-10-07 15:12:06 -07:00
Bob Vandette
a594a8dea5
Merge
2010-10-07 15:14:41 -04:00
Bob Vandette
72616ad2bc
6989297: Integrate additional portability improvements
...
Reviewed-by: vladidan, dholmes
2010-10-07 15:12:57 -04:00
Coleen Phillimore
39992cab03
6983240: guarantee((Solaris::min_stack_allowed >= (StackYellowPages+StackRedPages...) wrong
...
Min_stack_allowed is a compile time constant and Stack*Pages are settable
Reviewed-by: dholmes, kvn
2010-10-07 08:06:06 -07:00
Vladimir Kozlov
68f9001261
Merge
2010-10-06 14:18:32 -07:00
Tom Rodriguez
f3c22cd1e2
6989736: fix mapfile warnings on solaris
...
Reviewed-by: kvn, iveresov, jcoomes
2010-10-05 17:38:40 -07:00
Tom Rodriguez
84e48aee05
6988018: dtrace/hotspot/MethodInvocation/MethodInvocation002 crashes with client compiler
...
Reviewed-by: iveresov, kvn, kamg
2010-10-05 11:16:12 -07:00
Vladimir Kozlov
c5191a8103
6979458: VM crashes when -XX:ObjectAlignmentInBytes is too big
...
Set upper limit 256 for ObjectAlignmentInBytes value.
Reviewed-by: never, iveresov
2010-10-05 08:57:20 -07:00
Igor Veresov
32ebbc92ec
6989368: Regression in scimark2.MonteCarlo in jdk7_b112 on Linux
...
Fix ciMethod::instructions_size() to return correct value
Reviewed-by: kvn, twisti
2010-10-05 00:19:21 -07:00
Tom Rodriguez
f591ed981d
6968348: Byteswapped memory access can point to wrong location after JIT
...
Reviewed-by: twisti, kvn, iveresov
2010-10-04 17:09:18 -07:00
Karen Kinnear
4ba2050f4e
Merge
2010-10-04 10:08:29 -07:00
Karen Kinnear
9e4a795ff5
6763959: java.util.concurrent.locks.LockSupport.parkUntil(0) blocks forever
...
Absolute time 0 needs to return immediately.
Reviewed-by: phh, dcubed, dholmes
2010-10-04 13:11:10 -04:00
Erik Trimble
3ee389a913
Added tag hs20-b01 for changeset 75ef8813e3e2
2010-10-01 18:04:36 -07:00
Christine Lu
498a2a778a
Added tag jdk7-b112 for changeset 75ef8813e3e2
2010-10-01 15:45:01 -07:00
Antonios Printezis
189be5a71f
6980838: G1: guarantee(false) failed: thread has an unexpected active value in its SATB queue
...
Under certain circumstances a safepoint could happen between a JavaThread object being created and that object being added to the Java threads list. This could cause the active field of that thread's SATB queue to get out-of-sync with respect to the other Java threads. The solution is to activate the SATB queue, when necessary, before adding the thread to the Java threads list, not when the JavaThread object is created. The changeset also includes a small fix to rename the surrogate locker thread from "Surrogate Locker Thread (CMS)" to "Surrogate Locker Thread (Concurrent GC)" since it's also used in G1.
Reviewed-by: iveresov, ysr, johnc, jcoomes
2010-10-01 16:43:05 -04:00
John Cuthbertson
8980543dc1
Merge
2010-10-01 21:48:40 -07:00
John Cuthbertson
20289fbffd
6983311: G1: LoopTest hangs when run with -XX:+ExplicitInvokesConcurrent
...
Clear the concurrent marking "in progress" flag while the FullGCCount_lock is held. This avoids a race that can cause back to back System.gc() calls, when ExplicitGCInvokesConcurrent is enabled, to fail to initiate a marking cycle causing the requesting thread to hang.
Reviewed-by: tonyp, ysr
2010-10-01 18:23:16 -07:00
Y. Srinivas Ramakrishna
8fbdf5c7f0
6794422: Perm gen expansion policy for concurrent collectors
...
Concurrent collectors should expand the perm gen without a full STW GC, but possibly by triggering a concurrent collection. Temporary band-aid for G1 where no concurrent collection is kicked off since the perm gen is not collected concurrently.
Reviewed-by: johnc
2010-10-01 16:12:54 -07:00
Vladimir Kozlov
7cc55737b6
6916062: assert(_inserts <= _insert_limit,"hash table overflow") in NodeHash::hash_insert
...
Missing check for not empty worklist when puting memory node back on worklist and expecting address type update.
Reviewed-by: never
2010-09-30 18:31:45 -07:00
Igor Veresov
63fd308170
6988779: c1_LIRAssembler_x86.cpp crashes VS2010 compiler
...
The workaround changes the scope of the variable
Reviewed-by: phh, ysr, kvn
2010-09-30 16:00:40 -07:00
John Coomes
603e50f355
6988678: fatal error deadlock handling was unintentionally disabled
...
Reviewed-by: ysr
2010-09-30 12:15:13 -07:00
Zhengyu Gu
afc563751f
6988363: Rebrand vm vendor property settings (jdk7 only)
...
Vendor properties should be initialized after JDK version is determined.
Reviewed-by: kamg, ohair, dcubed, dholmes
2010-09-30 12:05:08 -04:00
Igor Veresov
8309071a08
6988346: 6986046 breaks tiered
...
Adjusted profiling code generation to use the new ValueStack implementation; lowered optimization level for c1_LinearScan.cpp on solaris x64.
Reviewed-by: kvn, never
2010-09-29 16:53:42 -07:00
Y. Srinivas Ramakrishna
cf2163334f
6692906: CMS: parallel concurrent marking may be prone to hanging or stalling mutators for periods of time
...
Inserted missing yield(check)s in closures used during the work-stealing phase of parallel concurrent marking, a missing synchronous yield-request in the cms perm gen allocation path, and a terminator-terminator for the offer_termination invocation that monitors the yield status of the concurrent marking task. Elaborated some documentation comments and made some task queue termination loop flags configurable at start-up to aid debugging in the field.
Reviewed-by: jmasa, johnc, poonam
2010-09-29 16:17:02 -07:00
Roland Westrelin
8067fc5d4a
6988303: 6986046 breaks build with recent gcc
...
Fixes build break
Reviewed-by: never, kvn
2010-09-29 18:53:28 +02:00
Christian Thalinger
59ea7a14e6
6987634: JSR 292 assert(start_bci() >= 0 && start_bci() < code_size()) failed: correct osr_bci argument
...
Reviewed-by: never, kvn
2010-09-29 00:30:57 -07:00
John Coomes
1cdd538ea5
6423256: GC stacks should use a better data structure
...
6942771: SEGV in ParScanThreadState::take_from_overflow_stack
Reviewed-by: apetrusenko, ysr, pbk
2010-09-28 15:56:15 -07:00
John Cuthbertson
aff36499e7
6941395: G1: Use only lock-free versions of region stack push() and pop()
...
Re-enable use of the lock-free versions of region stack push() and pop() by recording aborted regions in a thread-local structure, which are then processed when scanning of the region stack restarts. The previous locking versions of these routines are retained for diagnostic purposes.
Reviewed-by: tonyp, ysr
2010-09-28 09:51:37 -07:00
Tom Rodriguez
5384d6be9e
6987763: assert(kind() == EmptyExceptionState) failed: only EmptyExceptionStates can be modified
...
Reviewed-by: roland, kvn, iveresov
2010-09-27 20:44:18 -07:00
Igor Veresov
f5bac56265
6987115: Non-tiered compilation policy creates unnecessary C1 threads
...
Fixed NonTieredCompPolicy::compiler_count() to return correct thread count.
Reviewed-by: twisti, kvn
2010-09-27 15:04:40 -07:00
Roland Westrelin
718b005834
Merge
2010-09-24 13:14:32 -07:00
Christian Thalinger
79847991ad
6986944: JSR 292 assert(caller_nm->is_method_handle_return(caller_frame.pc())) failed: must be MH call site
...
Reviewed-by: never, kvn
2010-09-24 03:51:43 -07:00
Erik Trimble
b7d1b4674b
6987149: Fix incorrect Oracle copyright header in make/templates files
...
Minor fix to first line of template copyright files
Reviewed-by: ohair
2010-09-24 00:52:04 -07:00
Erik Trimble
03f9d08651
Merge
2010-09-24 00:51:15 -07:00
Christine Lu
fcc90d4983
Added tag jdk7-b111 for changeset a8fb6372bee7
2010-09-23 17:33:27 -07:00
Tom Rodriguez
bce771e0fe
6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
...
Reviewed-by: kvn, twisti
2010-09-22 23:51:03 -07:00
Tom Rodriguez
16efe7ce5c
6972540: sun/nio/ch/SocketChannelImpl compilation crashed when executing CompileTheWorld
...
Reviewed-by: kvn
2010-09-22 21:10:46 -07:00
Tom Rodriguez
f4b4eae617
6982537: Crash in Node*step_through_mergemem
...
Reviewed-by: kvn
2010-09-22 13:01:12 -07:00
Keith McGuigan
9e9551fdd8
Merge
2010-09-22 12:54:51 -04:00
Igor Veresov
0f31511718
6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails
...
Propagate the compiler type of the deopting method to vframeArrayElement::unpack_on_stack()
Reviewed-by: jrose, never
2010-09-21 13:38:35 -07:00
Daniel D. Daugherty
08b41f30d8
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
...
Refine fix for 6561870 to only rebuild sa-jdi.jar when needed
Reviewed-by: never, ohair, coleenp
2010-09-21 06:58:44 -07:00
Keith McGuigan
bc7a44e595
6975210: java.lang.VerifyError in some of JCK tests
...
Naked oop in verificationType::is_reference_assignable_from()
Reviewed-by: never, kvn, coleenp
2010-09-20 15:38:04 -04:00
Keith McGuigan
de088dd719
Merge
2010-09-17 19:45:12 -04:00
Zhengyu Gu
f0108fe6f5
Merge
2010-09-17 09:14:26 -07:00
Zhengyu Gu
f9eb9cccb9
6981753: Rebrand vm vendor property settings
...
Uses JDK_Version to determinate to set vm vendor to "Oracle Corporation" for JDK7 and later.
Reviewed-by: kamg, ohair, coleenp
2010-09-17 09:45:32 -04:00
Vladimir Kozlov
5e98ce13ab
Merge
2010-09-16 16:48:40 -07:00
Christine Lu
d346ecbbb3
Added tag jdk7-b110 for changeset 184ac472c680
2010-09-16 15:12:57 -07:00
John Cuthbertson
3af63c10ab
Merge
2010-09-16 13:45:55 -07:00
Tom Rodriguez
2e4e2602d7
6984979: OptimizeFill misses some cases with an odd memory graph
...
Reviewed-by: kvn
2010-09-15 20:25:37 -07:00
Keith McGuigan
1ab450b848
6974813: JVM needs to use demand loading for its DTrace probes
...
Pass -xlazyload to the 'dtrace -G' invocation
Reviewed-by: phh, ysr
2010-09-15 16:28:19 -04:00
John Coomes
7100220f9b
6985022: update make/jprt.properties for new jdk7 tools
...
Reviewed-by: ohair, kvn
2010-09-15 10:39:13 -07:00
Vladimir Kozlov
7df5e956d1
6984368: Large default heap size does not allow to use zero based compressed oops
...
Take into account HeapBaseMinAddress and round down MaxPermSize
Reviewed-by: never
2010-09-14 17:19:35 -07:00
Tom Rodriguez
e65f42fe5e
6982370: SIGBUS in jbyte_fill
...
Reviewed-by: kvn
2010-09-14 14:09:24 -07:00
Karen Kinnear
7ac64fa594
Merge
2010-09-14 10:15:27 -04:00
John R Rose
52e3d262a1
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
...
Reviewed-by: never
2010-09-13 23:24:30 -07:00
Vladimir Kozlov
7be7d19ba5
6984346: Remove development code in type.hpp
...
Remove code which use UseNewCode in type.hpp
Reviewed-by: never
2010-09-13 16:45:00 -07:00
Igor Veresov
aa21a39d97
6919069: client compiler needs to capture more profile information for tiered work
...
Added profiling of instanceof and aastore.
Reviewed-by: kvn, jrose, never
2010-09-13 12:10:49 -07:00
John Cuthbertson
2b0e8a56df
6981746: G1: SEGV with -XX:+TraceGen0Time
...
Pass correct value for length to NumberSeq constructor. Guard dereferences of "body_summary" pointer with a NULL check.
Reviewed-by: tonyp, ysr
2010-09-13 10:00:24 -07:00
Keith McGuigan
b9760f8836
Merge
2010-09-13 07:38:10 -07:00
Igor Veresov
0aba89442c
6984056: C1: incorrect code for integer constant addition on x64
...
Fix add/sub of constants to ints on x64
Reviewed-by: kvn
2010-09-11 15:21:37 -07:00
Y. Srinivas Ramakrishna
2cb284f394
Merge
2010-09-11 11:42:09 -07:00
Tomas Hurka
ce872b40fb
6765718: Indicate which thread throwing OOME when generating the heap dump at OOME
...
Emit a fake frame that makes it look like the thread is in the OutOfMemoryError zero-parameter constructor
Reviewed-by: dcubed
2010-09-11 08:18:31 +02:00
Y. Srinivas Ramakrishna
f53d569221
6983930: CMS: Various small cleanups ca September 2010
...
Fixed comment/documentation typos; converted some guarantee()s to assert()s.
Reviewed-by: jmasa
2010-09-10 17:07:55 -07:00
Karen Kinnear
218b17b913
6942092: Loader-constraint test is failing
...
Fix test string compare to match source update
Reviewed-by: dcubed, phh
2010-09-10 12:36:47 -04:00
Christine Lu
811a0f0155
Added tag jdk7-b109 for changeset 59327a28f6c0
2010-09-09 15:07:37 -07:00
Christine Lu
f90e336a8f
Merge
2010-09-09 14:27:59 -07:00
Pavel Tisnovsky
af2548723c
6934483: GCC 4.5 errors "suggest parentheses around something..." when compiling with -Werror and -Wall
...
These are minor changes fixing compile failure when -Wall -Werror flags are used under gcc 4.5.
Reviewed-by: twisti, kvn, rasbold
2010-09-09 05:24:11 -07:00
Christian Thalinger
93c9356496
Merge
2010-09-09 01:43:48 -07:00
Tom Rodriguez
0ecb9e3298
6965815: OptimizeStringConcat: assert(!q->is_MergeMem()) failed with specjbb2000
...
Reviewed-by: kvn
2010-09-08 20:28:57 -07:00
Erik Trimble
2077fb46a1
6983320: Fork HS19 to HS20 - renumber Major and build numbers of JVM
...
Update the Major and Build numbers for HS20
Reviewed-by: jcoomes
2010-09-08 18:33:31 -07:00