stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,135 Commits 2 Branches 0 Tags 1.2 GiB
320ce960ce
Commit Graph

3927 Commits

Author SHA1 Message Date
Goetz Lindenmaier
f28ac57f94 8000592: Improve adlc usability 
Several changes to adlc to improve its usability

Reviewed-by: kvn
 2012-10-09 16:09:31 -07:00
Stefan Karlsson
724e5ecfb3 8000659: NPG: ClassCastExceptions are unexpectedly thrown when testing nashorn 
Treat the oops in invoke_method_table() as strong roots when ClassUnloading is enabled.

Reviewed-by: kamg, coleenp
 2012-10-09 22:12:25 +02:00
Vladimir Ivanov
6674423523 7199654: Remove LoadUI2LNode 
Removed LoadUI2L node from Ideal nodes, use match rule in .ad files instead.

Reviewed-by: kvn
 2012-10-09 12:40:05 -07:00
Mikael Vidstedt
769dd50182 7197424: update copyright year to match last edit in jdk8 hotspot repository 
Update copyright year to 2012 for relevant files

Reviewed-by: dholmes, coleenp
 2012-10-09 10:09:34 -07:00
Roland Westrelin
61eb5a0549 7054512: Compress class pointers after perm gen removal 
Support of compress class pointers in the compilers.

Reviewed-by: kvn, twisti
 2012-10-09 10:11:38 +02:00
Mark Wielaard
ec0a9ee8a6 8000622: Forgot to hg add and check in test for JDK-7170638 
Add the test

Reviewed-by: coleenp, kamg
 2012-10-09 02:42:16 -04:00
Rickard Bäckman
25e07fb041 Merge 2012-10-09 07:41:27 +02:00
Christian Thalinger
7162ad011c 8000263: JSR 292: signature types may appear to be unloaded 
Reviewed-by: kvn, jrose
 2012-10-08 17:04:00 -07:00
Yumin Qi
92e727c8e4 Merge 2012-10-08 16:59:44 -07:00
Yumin Qi
b2cf8c4cb0 8000332: SA ClassDump throws exception after permgen removal 
In ClassWrite.writeFields(), fields count was mistakenly set to fields length which overflow the array index. Also removed a file which is leftover from 6879063 changeset.

Reviewed-by: coleenp, sspitsyn
 2012-10-08 16:48:52 -07:00
Vladimir Ivanov
b1d745897b 8000313: C2 should use jlong for 64bit values 
Replace all occurrences of long with jlong in C2 code.

Reviewed-by: kvn, twisti
 2012-10-08 13:02:13 -07:00
Mikael Gerdin
845106af13 8000358: G1: metaspace information not printed in PrintHeapAtGC output nor in hs_err file 
Missing call to MetaspaceAux::print_on() in G1CollectedHeap::print_on().

Reviewed-by: azeemj, jmasa
 2012-10-08 09:12:31 -07:00
Mark Wielaard
959d0a9ebb 7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field 
Don't use HS_DTRACE_PROBE_CDECL_N and HS_DTRACE_PROBE_N directly.

Reviewed-by: coleenp, kamg, dholmes, sspitsyn
 2012-10-08 09:18:54 -04:00
Kaushik Srenevasan
fd15ca5e44 7127708: G1: change task num types from int to uint in concurrent mark 
Change the type of various task num fields, parameters etc to unsigned and rename them to be more consistent with the other collectors. Code changes were also reviewed by Vitaly Davidovich.

Reviewed-by: johnc
 2012-10-06 01:17:44 -07:00
Vladimir Ivanov
2467d2f247 8000485: Hotspot build fails in Solaris Studio IDE when building dtrace 
Prepend '.' to the existing native library path

Reviewed-by: kvn, sspitsyn
 2012-10-05 19:44:49 -07:00
Vladimir Ivanov
81be4b2f15 8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64 
Move decoding into Dependencies::DepStream::argument, so no caller could see encoded context value (NULL) anymore.

Reviewed-by: twisti, kvn
 2012-10-05 19:29:29 -07:00
Vladimir Ivanov
822deb6ee6 7177003: C1: LogCompilation support 
Add LogCompilation support in C1 - both client and tiered mode.

Reviewed-by: twisti, kvn
 2012-10-05 18:57:10 -07:00
Alejandro Murillo
9e9db7f831 8000498: new hotspot build - hs25-b05 
Reviewed-by: jcoomes
 2012-10-05 13:37:08 -07:00
Alejandro Murillo
10f5782aff Added tag hs25-b04 for changeset 21b044417a2e 2012-10-05 13:28:17 -07:00
Alejandro Murillo
81a35920fd Merge 2012-10-05 13:28:16 -07:00
Vladimir Kozlov
85e21b3a30 Merge 2012-10-05 10:03:56 -07:00
David Holmes
5ad6116c61 Merge 2012-10-04 20:09:46 -04:00
David Holmes
363fac131c 7199186: runtime/7194254/Test7194254.java fails - wrong test name on @run 
Reviewed-by: kvn, twisti
 2012-10-04 19:52:09 -04:00
David Katleman
a09b38f3e4 Added tag jdk8-b59 for changeset 22fa34424aa9 2012-10-04 14:34:51 -07:00
Jon Masamitsu
f33eb9a9bd Merge 2012-10-04 14:01:07 -07:00
Jon Masamitsu
4fa0ac5256 7198873: NPG: VM Does not unload classes with UseConcMarkSweepGC 
Reviewed-by: johnc, mgerdin, jwilhelm
 2012-10-04 10:40:23 -07:00
John Cuthbertson
ed98ea0a88 8000311: G1: ParallelGCThreads==0 broken 
Divide by zero error, if ParallelGCThreads is 0, when adjusting the PLAB size.

Reviewed-by: jmasa, jcoomes
 2012-10-04 10:04:13 -07:00
Nils Eliasson
e228ec4078 8000102: Resolve include conflicts 
Removing include of c1/c1_runtime.hpp and opto/runtime.hpp from all os-files.

Reviewed-by: kvn
 2012-10-04 06:31:07 -07:00
Rickard Bäckman
e1d995ab86 7127792: Add the ability to change an existing PeriodicTask's execution interval 
Enables dynamic enrollment / disenrollment from the PeriodicTasks in WatcherThread.

Reviewed-by: dholmes, mgronlun
 2012-10-04 14:55:57 +02:00
Harold Seigel
284879b3fc 6884973: java -XX:Atomics=2 crashes 
Remove buggy experimental option

Reviewed-by: acorn, coleenp
 2012-10-04 08:43:14 -04:00
Harold Seigel
5a5c90dd1c 7198519: Broken build, hotspot-rt win USE_PRECOMPILED_HEADER=0 
Uncommented out include for sys/stat.h and deleted include statements that were commented out.

Reviewed-by: coleenp, acorn, dholmes
 2012-10-04 08:38:06 -04:00
David Katleman
9a3320a64e Merge 2012-10-03 15:31:59 -07:00
Jesper Wilhelmsson
3506d44c57 8000351: Tenuring threshold should be unsigned 
Change the flags and variables related to tenuring threshold to be unsigned

Reviewed-by: jmasa, johnc
 2012-10-03 20:31:41 +02:00
Jon Masamitsu
88ab075a6d 7199349: NPG: PS: Crash seen in jprt 
Reviewed-by: johnc
 2012-10-03 08:08:52 -07:00
Vladimir Kozlov
8d8d00ff00 7199742: A lot of C2 OSR compilations of the same method's bci 
Don't clone head of OSR loop.

Reviewed-by: jrose, twisti
 2012-10-02 14:49:21 -07:00
Vladimir Kozlov
e8332c76e9 7201026: add vector for shift count 
Add generation of vectors for scalar shift count.

Reviewed-by: roland, twisti, dlong
 2012-10-02 12:25:13 -07:00
Christian Thalinger
59b8489a0c 7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path 
Reviewed-by: jrose, kvn
 2012-10-01 14:50:10 -07:00
John Cuthbertson
aac13806ea 8000244: G1: Ergonomically set MarkStackSize and use virtual space for global marking stack 
Set the value of MarkStackSize to a value based on the number of parallel marking threads with a reasonable minimum. Expand the marking stack if we have to restart marking due to an overflow up to a reasonable maximum. Allocate the underlying space for the marking stack from virtual memory.

Reviewed-by: jmasa, brutisso
 2012-10-01 09:28:13 -07:00
Stefan Karlsson
7ccbee4177 8000228: Missing call to cr() when printing entry_point in nmethod, in os::print_location 
Reviewed-by: brutisso, neliasso
 2012-10-01 13:29:11 +02:00
Stefan Karlsson
3e967d8f8d 8000227: [obj|type]ArrayKlass::oop_print_on prints one line to tty instead of the provided output stream 
Reviewed-by: brutisso, sla, jmasa, coleenp
 2012-10-01 13:29:11 +02:00
Kevin Walls
80d5f4b66d 7200145: runtime/7196045/Test7196045.java fails with No class provided for `main' 
Reviewed-by: dholmes, dsamersoff
 2012-09-30 23:24:12 +01:00
Coleen Phillimore
28047d6a0f 8000213: NPG: Should have renamed arrayKlass and typeArrayKlass 
Capitalize these metadata types (and objArrayKlass)

Reviewed-by: stefank, twisti, kvn
 2012-09-29 06:40:00 -04:00
Alejandro Murillo
9972f3d338 8000251: new hotspot build - hs25-b04 
Reviewed-by: jcoomes
 2012-09-28 14:36:20 -07:00
Alejandro Murillo
10e48f968d Added tag hs25-b03 for changeset 4d2ca6fb1285 2012-09-28 13:39:41 -07:00
Vladimir Kozlov
fbd1f6e3be Merge 2012-09-28 10:16:29 -07:00
Stefan Karlsson
ddd6138b95 8000230: Change os::print_location to be more descriptive when a location is pointing into an object 
Reviewed-by: mgerdin, twisti
 2012-09-28 15:34:32 +02:00
Stefan Karlsson
74f09797c9 Merge 2012-10-01 11:07:31 +02:00
Stefan Karlsson
ebb8d12592 Merge 2012-09-28 14:14:25 +02:00
Vladimir Kozlov
d560ac115b 7198084: NPG: distance is too big for short branches in test_invocation_counter_for_mdp() 
Use long branches in test_invocation_counter_for_mdp()

Reviewed-by: twisti
 2012-09-27 15:49:48 -07:00
John Cuthbertson
157b8fa41b 7200261: G1: Liveness counting inconsistencies during marking verification 
The clipping code in the routine that sets the bits for a range of cards, in the liveness accounting verification code was incorrect. It set all the bits in the card bitmap from the given starting index which would lead to spurious marking verification failures.

Reviewed-by: brutisso, jwilhelm, jmasa
 2012-09-27 15:44:01 -07:00
David Katleman
291e3f0b9a Added tag jdk8-b58 for changeset f75a1b3efb69 2012-09-27 11:24:35 -07:00
Bharadwaj Yadavalli
d5d2e78faa 7193318: C2: remove number of inputs requirement from Node's new operator 
Deleted placement new operator of Node - node(size_t, Compile *, int).

Reviewed-by: kvn, twisti
 2012-09-27 09:38:42 -07:00
Dmitry Samersoff
47a8760b93 Merge 2012-09-27 20:22:57 +04:00
Abhijit Saha
989c8e0201 7199488: [TEST] runtime/7158800/InternTest.java failed due to false-positive on PID match 
Reviewed-by: coleenp
 2012-09-26 09:54:11 -07:00
Vladimir Kozlov
973fdc81a1 7200264: 7192963 changes disabled shift vectors 
Replaced is_vector_use() call with explicit check for vector shift's count.

Reviewed-by: twisti, roland, dlong, vlivanov
 2012-09-25 15:48:17 -07:00
Abhijit Saha
bd3cd1709f Merge 2012-09-25 11:47:04 -07:00
Vladimir Kozlov
9c3545d4fb 7200233: C2: can't use expand rules for vector instruction rules 
Added missed _bottom_type set in ArchDesc::defineExpand() and missed vector nodes in MatchRule::is_vector().

Reviewed-by: twisti, roland, dlong
 2012-09-25 10:41:15 -07:00
Bengt Rutisson
ceccaf4577 Merge 2012-09-25 18:28:16 +02:00
Jon Masamitsu
1ea36e2324 7200615: NPG: optimized VM build is broken 
Reviewed-by: kvn
 2012-09-25 07:05:55 -07:00
Bengt Rutisson
fcae0353d2 7200470: KeepAliveClosure not needed in CodeCache::do_unloading 
Removed the unused keep_alive parameter

Reviewed-by: stefank, dholmes, kamg, coleenp
 2012-09-25 14:58:12 +02:00
Fredrik Ohrstrom
70f397b4a2 7200065: Cross-compilation changes to support the new-build 
Reviewed-by: dholmes, ohair
 2012-09-25 07:58:42 -04:00
Yumin Qi
d540138a54 Merge 2012-09-24 20:04:19 -07:00
Vladimir Danushevsky
2e051041e3 Merge 2012-09-24 19:00:55 -04:00
Yumin Qi
22544e7a7c 6879063: SA should use hsdis for disassembly 
We should in SA to use hsdis for it like the JVM does to replace the current java based disassembler.

Reviewed-by: twisti, jrose, sla
 2012-09-24 12:44:00 -07:00
Alejandro Murillo
d6538dc298 7200236: new hotspot build - hs25-b03 
Reviewed-by: jcoomes
 2012-09-21 14:39:56 -07:00
Alejandro Murillo
38c34d56b0 Added tag hs25-b02 for changeset b3b50cc0cb4d 2012-09-21 14:02:58 -07:00
Alejandro Murillo
6f3e1a0593 Merge 2012-09-21 14:02:57 -07:00
Nils Loodin
8bc04a0b28 7200092: Make NMT a bit friendlier to work with 
Reviewed-by: kvn, ysr, azeemj
 2012-09-21 10:56:28 +02:00
John Coomes
1743a11163 7199082: write warning messages to stderr 
Reviewed-by: ysr, dholmes, sla
 2012-09-20 16:27:51 -07:00
Jon Masamitsu
5721eadb16 Merge 2012-09-20 13:49:27 -07:00
David Katleman
1f784d2ce5 Added tag jdk8-b57 for changeset 386342128efe 2012-09-20 13:44:28 -07:00
Jon Masamitsu
f6cc90e927 7199923: NPG: tools/javac/T7093325.java timeout 
Reviewed-by: stefank, coleenp, kvn
 2012-09-20 12:18:23 -07:00
John Cuthbertson
54412491e8 7190666: G1: assert(_unused == 0) failed: Inconsistency in PLAB stats 
Reset the fields in ParGCAllocBuffer, that are used for accumulating values for the ResizePLAB sensors in PLABStats, to zero after flushing the values to the PLABStats fields. Flush PLABStats values only when retiring the final allocation buffers prior to disposing of a G1ParScanThreadState object, rather than when retiring every allocation buffer.

Reviewed-by: jwilhelm, jmasa, ysr
 2012-09-20 09:52:56 -07:00
Kevin Walls
d37f7326ce Merge 2012-09-20 03:49:15 -07:00
John Cuthbertson
e78edc79b7 7193946: Move warnings associated with UseMemSetInBOT flag 
The warnings associated with the UseMemSetInBOT flag are duplicated in CMS and G1. The separate warnings have been removed and single instance of the warning has been placed in a common location.

Reviewed-by: brutisso, ysr
 2012-09-19 15:48:02 -07:00
Bill Pittore
8e0655095b 7195372: Wrong copyright in new files 
Fixed copyrights

Reviewed-by: dholmes
 2012-09-19 17:22:49 -04:00
Vladimir Kozlov
03d65ced3e 7198606: Improve VM optimization 
Remove incorrect code in OptimizeFill optimization.

Reviewed-by: roland, twisti
 2012-09-19 13:58:31 -07:00
John Coomes
df3f6e087e Merge 2012-09-19 16:18:55 -04:00
Brandon Mitchell
6573cbf346 7016955: G1: remove the is_zeroed parameter from the HeapRegion constructor 
The is_zeroed parameter is no longer used and so can be removed.

Reviewed-by: johnc, jmasa, brutisso
 2012-09-19 08:48:10 -07:00
Yumin Qi
124ddb9b47 Merge 2012-09-19 08:41:30 -07:00
Kevin Walls
1c502686ea 7196045: Possible JVM deadlock in ThreadTimesClosure when using HotspotInternal non-public API 
Reviewed-by: sspitsyn, dholmes
 2012-09-19 15:24:32 +01:00
Jon Masamitsu
37bddeb62b 7045397: NPG: Add freelists to class loader arenas 
Reviewed-by: coleenp, stefank, jprovino, ohair
 2012-09-18 23:35:42 -07:00
John Coomes
d8089b90e5 Merge 2012-09-18 19:44:39 -04:00
Jon Masamitsu
cf5f4f736f 7197557: NPG: nsk/sysdict/vm/stress/chain/chain004 hangs intermittently 
Reviewed-by: johnc, ysr
 2012-09-18 14:15:06 -07:00
Kelly O'Hair
f65906c1bc 7198329: Add $(sort) to object files used in links makes binarties more consistent 
Reviewed-by: dholmes, tbell, erikj, ihse, ohrstrom
 2012-09-18 13:15:28 -07:00
Zhengyu Gu
b9f111d166 Merge 2012-09-18 11:37:26 -07:00
Kelly O'Hair
b74620c703 Merge 2012-09-18 10:25:20 -07:00
Serguei Spitsyn
3236415bda 7191786: retransformClasses() does not pass in LocalVariableTypeTable of a method 
JVMTI REtruncformClasses must support LocalVariableTypeTable attribute

Reviewed-by: dcubed, dsamersoff, rbackman
 2012-09-18 10:10:43 -07:00
Zhengyu Gu
fb2076c572 7188594: Print statistic collected by NMT with VM flag 
Print out statistics of collected NMT data if it is on at VM exits

Reviewed-by: kvn, coleenp, twisti
 2012-09-17 16:37:26 -04:00
Zhengyu Gu
3276deb50c Merge 2012-09-17 13:34:07 -07:00
Magnus Ihse Bursie
b2b4d40c73 7172012: Make test-in-build an option (Queens) 
Reviewed-by: ohair, dholmes
 2012-09-17 11:46:25 -07:00
Zhengyu Gu
afd497eecc 7190089: NMT ON: NMT failed assertion on thread's stack base address 
Solaris only, record stack info to NMT after stack size adjustment was made for primordial threads

Reviewed-by: kvn, acorn, coleenp
 2012-09-17 10:20:04 -04:00
David Holmes
676c5a2769 Merge 2012-09-17 08:44:19 -04:00
Dmytro Sheyko
48255b9ff3 7194254: jstack reports wrong thread priorities 
Reviewed-by: dholmes, sla, fparain
 2012-09-17 07:36:31 -04:00
Staffan Larsen
e91b6584eb 7193201: [OS X] The development launcher should be signed and given task_for_pid privileges 
Reviewed-by: sspitsyn, nloodin, mgronlun, coleenp
 2012-09-17 11:46:19 +02:00
Bengt Rutisson
a08d48f9b1 7198130: G1: PrintReferenceGC output comes out of order 
Move the first part of the GC logging, including timestamp, to the start of the GC

Reviewed-by: johnc, jwilhelm
 2012-09-17 10:33:13 +02:00
Coleen Phillimore
9a271f468a 7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow 
Restore java/lang/ClassLoader.addClass() upcall

Reviewed-by: sspitsyn, dcubed, jmasa
 2012-09-17 10:46:59 -04:00
Alejandro Murillo
c188598ddd 7198641: new hotspot build - hs25-b02 
Reviewed-by: jcoomes
 2012-09-14 22:00:41 -07:00
Alejandro Murillo
a13f8a7da1 Added tag hs25-b01 for changeset ab29bec425bb 2012-09-14 21:50:58 -07:00
Alejandro Murillo
b5637a7e2e Merge 2012-09-14 21:50:58 -07:00
Zhengyu Gu
119c20297b 7198529: NPG: assert with NMT code in Thread destructor 
Thread stack's base address can be NULL if it is not started or exited before recording the base

Reviewed-by: kvn, fparain
 2012-09-14 12:55:50 -04:00
David Katleman
aeb1e1d09e Added tag jdk8-b56 for changeset 1bce16d0ddd1 2012-09-13 13:15:14 -07:00
Roland Westrelin
00c30b04f4 7198074: NPG: assert(((Metadata*)obj)->is_valid()) failed: obj is valid 
Missing test for T_METADATA leads to incorrect register allocation.

Reviewed-by: kvn
 2012-09-13 22:09:16 +02:00
Hal Mo
18582cee62 7197906: BlockOffsetArray::power_to_cards_back() needs to handle > 32 bit shifts 
Reviewed-by: brutisso, johnc, ysr
 2012-09-13 21:20:26 +02:00
Zhengyu Gu
a2f9b747a4 Merge 2012-09-11 20:12:55 -07:00
Zhengyu Gu
d8037e4c8d Merge 2012-09-11 18:28:51 -07:00
Zhengyu Gu
442e4b0e54 7181995: NMT ON: NMT assertion failure assert(cur_vm->is_uncommit_record() || cur_vm->is_deallocation_record 
Fixed virtual memory records merge and promotion logic, should be based on sequence number vs. base address order

Reviewed-by: coleenp, acorn
 2012-09-11 20:53:17 -04:00
Coleen Phillimore
6f1b52ab16 7196681: NPG: Some JSR 292 tests crash in Windows exception handler 
There was a rogue os::breakpoint() call in log_dependency left over from the jsr292 merge.  Also changed verify_oop() calls for metadata to verify_{method,klass}_ptr.

Reviewed-by: kvn, twisti
 2012-09-11 20:20:38 -04:00
Roland Westrelin
08757b8a99 7195816: NPG: Crash in c1_ValueType - ShouldNotReachHere 
C1 needs knowledge of T_METADATA at the LIR level.

Reviewed-by: kvn, coleenp
 2012-09-11 16:20:57 +02:00
Stefan Karlsson
b979c4ebe0 7197350: NPG: jvmtiHeapReferenceCallback receives incorrect reference_kind for system class roots 
Fix the iteration over the system classes and report the correct reference kind.

Reviewed-by: coleenp, rbackman
 2012-09-11 14:59:23 +02:00
Christian Thalinger
2ab9ff2658 7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed 
Reviewed-by: jrose, coleenp, jmasa, kvn
 2012-09-10 16:37:22 -07:00
Abhijit Saha
38b305878c Merge 2012-09-07 18:18:55 -07:00
Coleen Phillimore
6fda647450 7196103: NPG: Unable to allocate bit map for parallel garbage collection for the requested heap size 
Don't allocate huge class metaspace size by default on x64

Reviewed-by: stefank, jmasa, kvn
 2012-09-07 16:42:25 -04:00
Coleen Phillimore
12b9a4edbb 7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass 
Simple renaming to be consistent with instanceKlass->InstanceKlass renaming

Reviewed-by: stefank, jmasa
 2012-09-07 12:04:16 -04:00
David Katleman
2aa10d79aa Added tag jdk8-b55 for changeset 49f23700884c 2012-09-06 17:27:33 -07:00
Jon Masamitsu
cd5df1082a 7196298: Better fix for 7195789 
Reviewed-by: jcoomes, brutisso
 2012-09-06 07:28:30 -07:00
Coleen Phillimore
8536f548db 7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type 
Need to restore the vtable in metadata when we restore the type from the shared archive.

Reviewed-by: acorn, jcoomes, jmasa, jrose
 2012-09-05 20:08:08 -04:00
Vladimir Kozlov
f3b6368c39 7196167: NPG: mismerge in make/solaris/makefiles/fastdebug.make 
Remove the workaround of 7187454 problem which was restored incorrectly during NPG merge.

Reviewed-by: coleenp, dholmes
 2012-09-05 10:18:37 -07:00
Stefan Karlsson
36d57e3669 7195935: NPG: Some issues with compressed oops 
Don't decompress the klass pointer in the G1 pre-barrier code when !UseCompressedKlassPointers

Reviewed-by: coleenp, brutisso
 2012-09-05 10:39:29 +02:00
Jon Masamitsu
6f32be5139 7195789: NPG: assert(used + free == capacity) failed: Accounting is wrong 
Reviewed-by: coleenp, jcoomes
 2012-09-04 16:20:28 -07:00
Christian Thalinger
0f2dd1c15e 7196120: NPG: JSR 2292 test fails because missing fix for 7188911 
Reviewed-by: kvn, coleenp
 2012-09-04 18:01:20 -07:00
Roland Westrelin
badaff577b 7184649: NPG: Implement another MetdataPtr case 
Xmeet when both inputs are MetadataPtr.

Reviewed-by: kvn
 2012-09-04 23:27:55 +02:00
Stefan Karlsson
3610a76e25 7195968: NPG: oopDesc::list_ptr_from_klass is broken 
Remove incorrect cast

Reviewed-by: brutisso, coleenp
 2012-09-04 13:01:03 +02:00
Coleen Phillimore
eff152a7be 7195823: NPG: CMS reserved() doesn't match _rs.base() 
If the commit fails, the size isn't set so the assert fails.

Reviewed-by: kamg
 2012-09-03 18:37:12 -04:00
Jon Masamitsu
5c58d27aac 6964458: Reimplement class meta-data storage to use native memory 
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes

Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
 2012-09-01 13:25:18 -04:00
John Coomes
36eee7c8c8 7195615: new hotspot build - hs25-b01 
Reviewed-by: johnc
 2012-08-31 16:39:35 -07:00
John Coomes
ae110cd170 Added tag hs24-b22 for changeset a83f6d24c373 2012-08-31 16:17:41 -07:00
John Coomes
c6516ccaea Merge 2012-08-31 16:17:40 -07:00
Jiangli Zhou
c3b3276936 Merge 2012-08-31 12:59:10 -07:00
Jiangli Zhou
50b6647678 Merge 2012-08-31 14:47:01 -04:00
Christian Thalinger
6ddab0cf3c Merge 2012-08-31 10:48:08 -07:00
Bengt Rutisson
911d3e3ac6 Merge 2012-08-31 08:30:30 +02:00
David Katleman
f6008840a0 Added tag jdk8-b54 for changeset 0b41a071152f 2012-08-30 10:27:07 -07:00
Bill Pittore
58a50b25eb 7154641: Servicability agent should work on platforms other than x86, sparc 
Added capability to load support classes for other cpus

Reviewed-by: coleenp, bobv, sla
 2012-08-30 11:20:01 -04:00
Brandon Mitchell
f51faf2bbe 7194409: os::javaTimeNanos() shows hot on CPU_CLK_UNHALTED profiles 
Add inline directives to os::Linux::supports_monotonic_clock() and os::Bsd::supports_monotonic_clock().

Reviewed-by: johnc, azeemj, mikael
 2012-08-29 13:02:54 -07:00
Vladimir Kozlov
da65cc4532 7160161: Missed safepoint in non-Counted loop 
Do not remove safepoints during peeling optimization.

Reviewed-by: twisti
 2012-08-29 13:02:40 -07:00
Pavel Punegov
373b8ccd27 7191926: Remove MKS dependency in Hotspot regression tests 
Add case for CYGWIN in .sh files.

Reviewed-by: coleenp, kvn
 2012-08-29 14:49:05 -04:00
Christian Thalinger
40c1bd4242 7192406: JSR 292: C2 needs exact return type information for invokedynamic and invokehandle call sites 
Reviewed-by: kvn
 2012-08-28 15:24:39 -07:00
John Cuthbertson
eb2c52c717 7041879: G1: introduce stress testing parameter to cause frequent evacuation failures 
Add the flags G1EvacuationFailureALot flag (and supporting flags) to force trigger evacuation failures. The support flags control how often to trigger an evacuation failure and during which types of evacuation pause. This functionality is analogous to that of PromotionFailureALot for the other collectors.

Reviewed-by: brutisso
 2012-08-28 15:20:08 -07:00
Rickard Bäckman
228b4f6d7f 7093328: JVMTI: jvmtiPrimitiveFieldCallback always report 0's for static primitives 
Reviewed-by: dholmes, dcubed
 2012-08-28 15:15:29 +02:00
Coleen Phillimore
5f4a2405a7 Merge 2012-10-15 22:33:19 -04:00
Kevin Walls
b296b69382 7195151: Multiplatform tescase for 6929067 
Reviewed-by: kamg, kvn
 2012-10-15 16:48:48 +01:00
Keith McGuigan
04a9a14193 7054345: Support version 52.0 class file in HotSpot 
Accept classfiles with major version 52

Reviewed-by: coleenp, acorn
 2012-10-11 14:27:54 -04:00
Harold Seigel
6b158b4089 7199068: NPG: SharedSkipVerify is meaningless 
Remove the SharedSkipVerify flag

Reviewed-by: kamg, sspitsyn, coleenp
 2012-10-10 17:04:33 -04:00
Tao Mao
447e7065d2 6677625: Move platform specific flags from globals.hpp to globals_<arch>.hpp 
Reviewed-by: kvn, dholmes, coleenp
 2012-08-27 15:17:17 -07:00
Vladimir Kozlov
f0d08c04f1 7148109: C2 compiler consumes too much heap resources 
Add split_arena to allocate temporary arrays in PhaseChaitin::Split() and free them on method's exit.

Reviewed-by: twisti
 2012-08-27 09:46:38 -07:00
Daniel D. Daugherty
2ec592f290 Merge 2012-08-24 19:45:42 -07:00
Alejandro Murillo
2271c9dfad 7194004: new hotspot build - hs24-b22 
Reviewed-by: jcoomes
 2012-08-24 16:23:59 -07:00
Alejandro Murillo
da2de44d1a Added tag hs24-b21 for changeset 2ab6bbc9883c 2012-08-24 15:51:20 -07:00
Alejandro Murillo
08e886940b Merge 2012-08-24 15:51:19 -07:00
Christian Thalinger
2509329d59 Merge 2012-08-24 11:48:32 -07:00
Bengt Rutisson
74cef1447a Merge 2012-08-24 09:45:08 +02:00
David Katleman
17a596280e Added tag jdk8-b53 for changeset 441121a0bcde 2012-08-23 12:27:33 -07:00
Vladimir Kozlov
fbcc3da64f 7192965: assert(is_aligned_sets(size)) failed: mask is not aligned, adjacent sets 
Change pair check to vector check in RA bias coloring code.

Reviewed-by: jrose, twisti
 2012-08-23 09:13:16 -07:00
Bengt Rutisson
68bbfe24e7 7178363: G1: Remove the serial code for PrintGCDetails and make it a special case of the parallel code 
Also reviewed by vitalyd@gmail.com. Introduced the WorkerDataArray class. Fixed some minor logging bugs.

Reviewed-by: johnc, mgerdin
 2012-08-23 10:21:12 +02:00
Bengt Rutisson
6dbe18d702 7193157: G1: Make some develpflags available in product builds 
Also reviewed by: vitalyd@gmail.com. Make G1DefaultMinNewGenPercent, G1DefaultMaxNewGenPercent, G1OldCSetRegionLiveThresholdPercent and G1OldCSetRegionThresholdPercent experimental flags

Reviewed-by: ysr, johnc, jmasa
 2012-08-23 05:25:59 +02:00
Vladimir Kozlov
cbfca3259c 7192963: assert(_in[req-1] == this) failed: Must pass arg count to 'new' 
Fixed Pack node generation. Not vectorize shift instructions if count is not the same for all shifts and if count is vector.

Reviewed-by: twisti
 2012-08-22 11:55:40 -07:00
Roland Westrelin
405f5a75cd 7171824: assert(_offset >= 1) failed: illegal call to offset() 
C1 value numbering hits unloaded klass.

Reviewed-by: kvn, twisti
 2012-08-22 14:29:57 +02:00
Staffan Larsen
6d8fa095b3 7192916: Hotspot development launcher should use DYLD_LIBRARY_PATH on OS X 
Reviewed-by: dholmes, dsamersoff, nloodin
 2012-08-22 10:01:51 +02:00
Daniel D. Daugherty
5a47de8e75 Merge 2012-08-21 19:25:20 -07:00
Vladimir Kozlov
ef4102148a 7192964: assert(false) failed: bad AD file 
Shifts with loop variant counts "a[i]=1<<b[i];" should not be vectorized since hw does not support it.

Reviewed-by: twisti
 2012-08-21 14:50:02 -07:00
John Cuthbertson
61493cd92e 7185699: G1: Prediction model discrepancies 
Correct the result value of G1CollectedHeap::pending_card_num(). Change the code that calculates the GC efficiency of a non-young heap region to use historical data from mixed GCs and the actual number of live bytes when predicting how long it would take to collect the region. Changes were also reviewed by Thomas Schatzl.

Reviewed-by: azeemj, brutisso
 2012-08-21 14:10:39 -07:00
Christian Thalinger
a14e902e92 7192167: JSR 292: C1 has old broken code which needs to be removed 
Reviewed-by: kvn, roland, jrose
 2012-08-21 10:48:50 -07:00
John Cuthbertson
384650cb3e 7192128: G1: Extend fix for 6948537 to G1's BOT 
G1 does not appear to be immune to the issue described in CR 6948537 and increasing the size of old-generation PLABs appears to increase the liklihood of seeing the issue. Extend the fix for 6948537 to G1's BlockOffsetTable.

Reviewed-by: brutisso, jmasa
 2012-08-21 10:05:57 -07:00
Vladimir Kozlov
04c6a7ce10 7190310: Inlining WeakReference.get(), and hoisting $referent may lead to non-terminating loops 
In C2 add software membar after load from Reference.referent field to prevent commoning of loads across safepoint since GC can change its value. In C1 always generate Reference.get() intrinsic.

Reviewed-by: roland, twisti, dholmes, johnc
 2012-08-20 09:58:58 -07:00
Vladimir Kozlov
e3c3c8527e 6340864: Implement vectorization optimizations in hotspot-server 
Added asm encoding and mach nodes for vector arithmetic instructions on x86.

Reviewed-by: roland
 2012-08-20 09:07:21 -07:00
Alejandro Murillo
913294e5db Merge 2012-08-17 16:47:04 -07:00
Alejandro Murillo
b11a680280 Merge 2012-08-17 15:41:04 -07:00
Daniel D. Daugherty
9d85b8e187 Merge 2012-08-17 11:57:46 -07:00
David Katleman
22d6b39dc8 Added tag jdk8-b52 for changeset c2e1881d85fa 2012-08-16 11:43:12 -07:00
Alejandro Murillo
e284fe5f5a 7191765: make jdk8 the default jprt release for hs24 
Reviewed-by: jcoomes
 2012-08-15 16:49:38 -07:00
Zhengyu Gu
5bc134a53b 7191124: Optimized build is broken due to inconsistent use of DEBUG_ONLY and NOT_PRODUCT macros in NMT 
Updated all related variables and methods to use NOT_PRODUCT macros

Reviewed-by: coleenp, acorn, kvn
 2012-08-14 13:56:46 -04:00
Alejandro Murillo
4e28ce96d0 7190772: new hotspot build - hs24-b21 
Reviewed-by: jcoomes
 2012-08-10 23:19:43 -07:00
Tim Bell
c99e9bbc0f 7190512: Fix for 7181175 broke hotspot/make/windows/create.bat builds 
Add some quotes around the classpath in the project file rule.

Reviewed-by: dcubed
 2012-08-10 23:16:52 -07:00
Alejandro Murillo
de7d70ee06 Added tag hs24-b20 for changeset 25eb3939c390 2012-08-10 23:07:38 -07:00
Christian Thalinger
74e492d286 Merge 2012-08-10 17:50:24 -07:00
Christian Thalinger
c9fb0d52ee Merge 2012-08-10 15:50:49 -07:00
Abhijit Saha
04865aa88a Merge 2012-08-10 10:41:13 -07:00
David Katleman
923215d482 Added tag jdk8-b51 for changeset 90fa336b0a49 2012-08-09 18:00:58 -07:00
Vladimir Danushevsky
886fb99d53 Merge 2012-08-08 16:09:11 -04:00
Joseph Provino
b6622dce73 7153374: ARM ONLY .. linking problem with new compilers.. Need to use -fPIC 
Add "arm" to the list of processors that need -fPIC

Reviewed-by: vladidan, dholmes
 2012-08-08 15:43:51 -04:00
Christian Thalinger
e622fcdc27 7188911: nightly failures after JSR 292 lazy method handle update (round 2) 
Reviewed-by: kvn, jrose
 2012-08-07 14:32:08 -07:00
Alejandro Murillo
eee7b367a1 7189729: jprt.properties should include release jdk7u8 
Reviewed-by: jcoomes
 2012-08-07 09:53:12 -07:00
Keith McGuigan
dbe25e46f3 7116786: RFE: Detailed information on VerifyErrors 
Provide additional detail in VerifyError messages

Reviewed-by: sspitsyn, acorn
 2012-08-06 15:54:45 -04:00
Brandon Mitchell
3234f913bb 6818524: G1: use ergonomic resizing of PLABs 
Employ PLABStats instances to record information about survivor and old PLABs, and use the recorded stats to adjust the sizes of survivor and old PLABS.

Reviewed-by: johnc, ysr
 2012-08-06 12:20:14 -07:00
Daniel D. Daugherty
75f8f79764 Merge 2012-08-06 09:34:40 -07:00
Volker Simonis
6c6a957121 7181175: Enable builds on Windows with MinGW/MSYS 
This fix is the minimum number of Makefile changes to enable building HotSpot with MinGW/MSYS

Reviewed-by: jcoomes, dcubed, tbell, ohair
 2012-08-03 18:34:28 -07:00
Alejandro Murillo
82446583c4 7189086: new hotspot build - hs24-b20 
Reviewed-by: jcoomes
 2012-08-03 13:24:02 -07:00
Alejandro Murillo
8651eaa785 Added tag hs24-b19 for changeset a8397f4de214 2012-08-03 13:13:43 -07:00
Alejandro Murillo
55c459b8fb Merge 2012-08-03 13:13:42 -07:00
Abhijit Saha
ba9f0c030f Merge 2012-08-02 22:23:28 -07:00
David Katleman
04cd1ed8a0 Added tag jdk8-b50 for changeset 91311c4d5882 2012-08-02 15:33:31 -07:00
Daniel D. Daugherty
4a848cf3e5 7188168: 7071904 broke the DEBUG_BINARIES option on Linux 
Change DEBUG_BINARIES option logic to be more clear.

Reviewed-by: fparain, andrew
 2012-08-02 14:54:14 -07:00
Abhijit Saha
4c3a0cd840 Merge 2012-08-02 14:29:12 -07:00
Zhengyu Gu
38a6055c37 Merge 2012-08-01 16:16:13 -07:00
Zhengyu Gu
9047207b09 Merge 2012-08-01 15:00:50 -07:00
Christian Thalinger
e409ee94ae 7188276: JSR 292: assert(ct == T_OBJECT) failed: rt=T_OBJECT, ct=13 
Reviewed-by: kvn, jrose
 2012-08-01 14:44:26 -07:00
Zhengyu Gu
a13f3bdad8 7185614: NMT ON: "check by caller" assertion failed on nsk ThreadMXBean test 
7187429: NMT ON: Merge failure should cause NMT to shutdown

Fixed NMT assertion failures

Reviewed-by: acorn, kvn
 2012-08-01 17:19:30 -04:00
Vladimir Kozlov
ebeff89a89 7188227: VM should recognize M-series SPARC 
Check kstat data for SPARC-M.

Reviewed-by: roland
 2012-08-01 14:10:32 -07:00
Coleen Phillimore
d52b3a7eb7 7129723: MAC: Some regression tests need to recognize Mac OS X platform 
Add Darwin like Linux to shell scripts

Reviewed-by: kvn, kamg, dholmes
 2012-08-01 16:52:43 -04:00
Daniel D. Daugherty
7f344540be Merge 2012-07-31 18:37:13 -07:00
Andrew John Hughes
7c357b0628 7186278: Build error after CR#6995781 / 7151532 with GCC 4.7.0 
Templates need this object if not using template parameter in call

Reviewed-by: coleenp, kamg, dholmes
 2012-07-31 16:01:56 -04:00
Vladimir Kozlov
5e05a0d592 7187454: stack overflow in C2 compiler thread on Solaris x86 
Added new FormatBufferResource class to use thread's resource area for error message buffer.

Reviewed-by: twisti
 2012-07-30 09:49:25 -07:00
Zhengyu Gu
318ce174a4 Merge 2012-07-30 07:21:15 -07:00
Zhengyu Gu
5515df5c31 7186778: MachO decoder implementation for MacOSX 
Implementation of decoder for Apple's MacOSX. The implementation is based on the patch provided by Kevin Walls.

Reviewed-by: coleenp, kamg, kevinw
 2012-07-30 10:25:52 -04:00
Jon Masamitsu
b69d120923 Merge 2012-07-27 21:41:17 -07:00
Alejandro Murillo
dafee02d32 7187463: new hotspot build - hs24-b19 
Reviewed-by: jcoomes
 2012-07-27 16:51:44 -07:00
Christian Thalinger
b9eb5785cc 7187290: nightly failures after JSR 292 lazy method handle update 
Reviewed-by: kvn, twisti
 2012-07-27 16:14:15 -07:00
Alejandro Murillo
3f2effb856 Added tag hs24-b18 for changeset bf02c20037ae 2012-07-27 12:08:33 -07:00
Alejandro Murillo
dc88d0a088 Merge 2012-07-27 12:08:32 -07:00
Jon Masamitsu
a4ee9cab5a Merge 2012-07-26 23:43:36 -07:00
Jiangli Zhou
d75f8a04c8 Merge 2012-07-26 16:55:42 -07:00
Christine Lu
4ea3138612 Added tag jdk8-b49 for changeset 9e2de5dca700 2012-07-26 16:48:17 -07:00
Jiangli Zhou
338bf6e0b1 7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses 
Lower compiler optimization level when compiling jvmtiClassFileReconstituter.cpp as a workaround for the solaris x86 5.10 cc bug.

Reviewed-by: kvn, coleenp
 2012-07-26 17:24:31 -04:00
Jon Masamitsu
3d41dfe891 Merge 2012-07-24 14:48:58 -07:00
Christian Thalinger
12901d0e5b 7023639: JSR 292 method handle invocation needs a fast path for compiled code 
6984705: JSR 292 method handle creation should not go through JNI

Remove assembly code for JDK 7 chained method handles

Co-authored-by: John Rose <john.r.rose@oracle.com>
Co-authored-by: Michael Haupt <michael.haupt@oracle.com>
Reviewed-by: jrose, twisti, kvn, mhaupt
 2012-07-24 10:51:00 -07:00
Jiangli Zhou
67f97ee6eb Merge 2012-07-24 13:16:26 -04:00
Abhijit Saha
5a456b0991 7185550: TEST: runtime/7020373/Test7020373.sh fails because there is no test/runtime/7020373/testcase.jar 
Reviewed-by: coleenp
 2012-07-23 14:28:38 -07:00
Alejandro Murillo
893817c28d 7185775: new hotspot build - hs24-b18 
Reviewed-by: jcoomes
 2012-07-23 13:04:59 -07:00
Alejandro Murillo
5ca5cc7488 Added tag hs24-b17 for changeset bc3545585f1d 2012-07-23 12:54:21 -07:00
Alejandro Murillo
b7b568e088 Merge 2012-07-23 12:54:20 -07:00
Christine Lu
7c2cc82bb5 Added tag jdk8-b48 for changeset 16ab57e58669 2012-07-23 12:38:08 -07:00
Coleen Phillimore
f2ebc850fd Merge 2012-07-20 12:09:31 -04:00
Vladimir Kozlov
c4a4b178ef Merge 2012-07-19 16:17:41 -07:00
Antonios Printezis
a6580a7e63 7114678: G1: various small fixes, code cleanup, and refactoring 
Various cleanups as a prelude to introducing iterators for HeapRegions.

Reviewed-by: johnc, brutisso
 2012-07-19 15:15:54 -07:00
Zhengyu Gu
b5b29845bd Merge 2012-07-19 06:24:46 -07:00
Zhengyu Gu
a0930ac7cd Merge 2012-07-19 09:10:12 -04:00
Zhengyu Gu
f9083712dd 7182543: NMT ON: Aggregate a few NMT related bugs 
1) Fixed MemTrackWorker::generations_in_used() calculation 2) Ensured NMT not to leak memory recorders after shutdown 3) Used ThreadCritical to block safepoint safe threads

Reviewed-by: acorn, coleenp, dholmes, kvn
 2012-07-19 09:05:42 -04:00
Abhijit Saha
bba3260a52 7053586: TEST: runtime/7020373/Test7020373.sh fails on 64-bit platforms 
Reviewed-by: kamg
 2012-07-17 22:16:17 -07:00
Jon Masamitsu
08ea4ea9b8 Merge 2012-07-17 14:33:17 -07:00
Thomas Schatzl
7ac8896f1d 7182260: G1: Fine grain RSet freeing bottleneck 
Chain the fine grain PerRegionTables in an individual RSet together and free them in bulk using a single operation.

Reviewed-by: johnc, brutisso
 2012-07-17 12:24:05 -07:00
Brandon Mitchell
6fdfe86bbd 7184772: G1: Incorrect assert in HeapRegionLinkedList::add_as_head() 
Assertion incorrectly checks that _head is NULL and should be checking that _tail is NULL instead.

Reviewed-by: johnc
 2012-07-17 14:57:02 -07:00
John Cuthbertson
7e2522f283 7173712: G1: Duplicated code in G1UpdateRSOrPushRefOopClosure::do_oop_nv() 
Duplicated code from G1RemSet::par_write_ref() inlined into G1UpdateRSOrPushRefOopClosure::do_oop_nv() was showing up in profiles with a fairly high amount of CPU time. Manually inline the main part of G1RemSet::par_write_ref() to eliminate the code duplication.

Reviewed-by: azeemj, brutisso
 2012-07-17 11:52:10 -07:00
Vladimir Kozlov
4b6b0ec3c4 Merge 2012-07-17 11:16:13 -07:00
Jiangli Zhou
8f066485db Merge 2012-07-17 12:32:26 -04:00
Vladimir Kozlov
310ad38a4b Merge 2012-07-16 19:50:52 -07:00
Vladimir Kozlov
15f4203b0f 7181494: cleanup avx and vectors code 
Renamed mach nodes which use scalar AVX instructions, added integer vectors shuffling instructions

Reviewed-by: twisti
 2012-07-16 17:10:22 -07:00
Jon Masamitsu
00502cdd51 Merge 2012-07-16 13:00:26 -07:00
Dean Long
62ce00b4ca 7147464: Java crashed while executing method with over 8k of dneg operations 
Replace recursive method with iterative

Reviewed-by: kvn, twisti
 2012-07-16 15:31:18 -04:00
Christian Thalinger
19ea8f720f 7087357: JSR 292: remove obsolete code after 7085860 
Reviewed-by: kvn, never
 2012-07-16 11:14:41 -07:00
Zhengyu Gu
196abe2523 7181986: NMT ON: Assertion failure when running jdi ExpiredRequestDeletionTest 
Changed _query_lock to heap object from static object. Also fixed _query_lock and snapshot lock ranks, so they can participate deadlock detection.

Reviewed-by: coleenp, dholmes, kvn
 2012-07-16 14:10:34 -04:00
Frederic Parain
c0a96ff2a4 7183754: Test runtime/6294277/Test6294277.sh runs wrong JVM 
Reviewed-by: kamg, coleenp, ctornqvi
 2012-07-16 04:06:44 -07:00
Vladimir Kozlov
27e9d6f36d 7123926: Some CTW test crash: !_control.contains(ctrl) 
Don't eliminate Integer::toString() call node during String concatenation optimization if it has several uses.

Reviewed-by: twisti
 2012-07-13 17:48:26 -07:00
Jiangli Zhou
7b82f72ba9 Merge 2012-07-13 20:14:27 -04:00
Alejandro Murillo
b5cfc76c1e 7184050: new hotspot build - hs24-b17 
Reviewed-by: jcoomes
 2012-07-13 14:16:21 -07:00
Alejandro Murillo
8aaf8673f1 Added tag hs24-b16 for changeset 3db9eaf7c6ab 2012-07-13 14:06:34 -07:00
Alejandro Murillo
4b959a29ea Merge 2012-07-13 14:06:33 -07:00
David Katleman
32a0fe5fa4 Added tag jdk8-b47 for changeset a655fb35e798 2012-07-12 16:48:00 -07:00
Vladimir Kozlov
59bb4ea7cc Merge 2012-07-12 14:19:15 -07:00
Coleen Phillimore
5579942e7a Merge 2012-07-12 14:26:25 -04:00