stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,837 Commits 2 Branches 0 Tags 1.2 GiB
9b5b4b60c3
Commit Graph

7745 Commits

Author SHA1 Message Date
Coleen Phillimore
24201272d6 Merge 2014-12-12 18:13:22 +00:00
Coleen Phillimore
4250926e07 8066803: compiler/intrinsics/mathexact/SubExactINonConstantTest.java crashed in os::is_first_C_frame(frame*) 
Stop native stack walk when we get to compiled or stub frame.

Reviewed-by: hseigel, lfoltan, ctornqvi
 2014-12-12 13:19:33 -05:00
Albert Noll
7613da167b Merge 2014-12-12 08:40:19 -08:00
Ivan Gerasimov
ff0ca0af12 8066863: bigapps/runThese/nowarnings fails: Java HotSpot(TM) 64-Bit Server VM warning: WaitForMultipleObjects 
Limit the number of thread handles to MAXIMUM_WAIT_OBJECTS

Reviewed-by: dholmes, dcubed
 2014-12-12 17:24:17 +03:00
Tobias Hartmann
4d7b50bd51 8067337: Remove Whitebox API from hotspot repository 
Remove Whitebox API from hotspot repository after it was moved to top level repository.

Reviewed-by: iignatyev
 2014-12-12 13:13:01 +01:00
Tobias Hartmann
a7e0bdf47c Merge 2014-12-12 09:58:37 +00:00
Tobias Hartmann
bf022cf7dc 8066433: Move Whitebox test library to top level repository 
Moved Whitebox test library to top level repository.

Reviewed-by: iignatyev, sla, mr
 2014-12-12 09:37:38 +01:00
Tobias Hartmann
7a70e63c71 Merge 2014-12-12 08:15:30 +00:00
Tobias Hartmann
09aa6561da 8066763: fatal error "assert(false) failed: unexpected yanked node" in postaloc.cpp:139 
Check for dead input nodes after replacing compare node with implicit null check.

Reviewed-by: kvn
 2014-12-12 09:07:54 +01:00
Alejandro Murillo
e6d32333f4 Merge 2014-12-11 23:06:14 -08:00
Coleen Phillimore
b9c0d0abd9 Merge 2014-12-12 02:51:07 +00:00
Max Ockner
1d76295d70 8047290: Make Mutex::_no_safepoint_check_flag locks verify that this lock never checks for safepoint 
Ensure consistent safepoint checking in Mutex/Monitor locking methods.

Reviewed-by: dholmes, dcubed, coleenp
 2014-12-11 21:34:43 -05:00
Albert Noll
a9e4d723c1 Merge 2014-12-11 16:22:47 -08:00
Lana Steuck
dd6e6feb3d Merge 2014-12-11 12:28:03 -08:00
David Katleman
c12ade4fa2 Added tag jdk9-b42 for changeset b1cf5f128493 2014-12-11 11:44:00 -08:00
Jesper Wilhelmsson
da4a88d5f9 Merge 2014-12-11 20:39:25 +01:00
Kim Barrett
284e23e67e 8066822: Remove PSMarkSweep::set_reference_processor 
Reviewed-by: brutisso, tschatzl
 2014-12-11 19:44:32 +01:00
Dmitry Samersoff
2e3ffa9c5d 8028773: warnings from b116 for hotspot.agent.src.share.native: JNI exception pending 
Added couple of missed exception checks

Reviewed-by: sla, sspitsyn
 2014-12-11 09:15:10 -08:00
Jesper Wilhelmsson
f101b30199 6522873: Java not print "Unrecognized option" when it is invalid option 
Introduced a new version of match_option() that don't allow a tail after the flag name and used it for flags without extra arguments

Reviewed-by: dholmes, dcubed
 2014-12-11 02:43:50 +01:00
Volker Simonis
7d42a4167f 8067015: Implement os::pd_map_memory() on AIX 
Reviewed-by: dholmes
 2014-12-10 19:12:27 +01:00
Staffan Friberg
912fb05672 8066442: Add PS and ParOld support for promotion event 
Reviewed-by: tschatzl, ehelin
 2014-12-10 10:10:43 -08:00
Bengt Rutisson
7bde8bebfb 8067115: Add jtreg gc tests to Hotspot JPRT jobs 
Reviewed-by: tschatzl, jwilhelm, ehelin
 2014-12-11 07:32:24 +01:00
Roland Westrelin
0dbf9d7161 8067144: SIGSEGV with +TraceDeoptimization in Deoptimization::print_objects 
-XX:+TraceDeoptimization tries to print realloc'ed objects even when there are none

Reviewed-by: kvn
 2014-12-10 16:45:55 +01:00
Michail Chernov
56db4f28c9 8064909: FragmentMetaspace.java got OutOfMemoryError 
Increased heap size to prevent "java.lang.OutOfMemoryError: Java heap space" exception

Reviewed-by: jmasa, dfazunen, jwilhelm
 2014-12-10 13:58:30 +00:00
Bengt Rutisson
bdb2636f9e 8066782: Move common code from CMSGeneration and TenuredGeneration to CardGeneration 
Reviewed-by: kbarrett, tschatzl
 2014-12-10 11:32:22 +01:00
Bengt Rutisson
b26180dfe9 8066781: Minor cleanups to TenuredGeneration 
Reviewed-by: kbarrett, tschatzl
 2014-12-10 11:31:43 +01:00
Bengt Rutisson
ef7d6c3b9d 8066780: Split CardGeneration out to its own file 
Reviewed-by: kbarrett, tschatzl
 2014-12-10 11:30:46 +01:00
Igor Veresov
f4a9c05895 Merge 2014-12-09 21:33:51 +00:00
Igor Veresov
5af5b25f98 8066900: Array Out Of Bounds Exception causes variable corruption 
Fix FP registers save/restore during exception handling

Reviewed-by: kvn, vlivanov
 2014-12-09 12:25:38 -08:00
Roland Westrelin
caa8dcea64 8066103: C2's range check smearing allows out of bound array accesses 
Range check smearing uncorrectly adjust first range check in a list of range checks to cover all of them

Reviewed-by: jrose, kvn, iveresov
 2014-12-09 18:49:13 +01:00
Igor Ignatyev
d1220c8dee Merge 2014-12-09 14:49:27 +00:00
Tatiana Pivovarova
79ed4de1e1 8065134: Need WhiteBox::allocateCodeBlob(long, int) method to be implemented 
Reviewed-by: kvn, dholmes, iignatyev
 2014-12-09 17:31:40 +03:00
Thomas Schatzl
5d868d4e0f 8066102: Clean up HeapRegionRemSet files 
Remove dead code, tighten public interfaces and improve documentation in the HeapRegionRemSet implementation.

Reviewed-by: mgerdin, kbarrett
 2014-12-09 12:47:19 +01:00
Goetz Lindenmaier
46714a7809 8066964: ppc64: argument and return type profiling, fix problem with popframe 
Reviewed-by: roland, kvn
 2014-12-09 11:57:46 +01:00
Mikael Gerdin
cc786b287d 8067655: Clean up G1 remembered set oop iteration 
Pass on the static type G1ParPushHeapRSClosure to allow oop_iterate devirtualization

Reviewed-by: jmasa, kbarrett
 2014-12-08 18:57:33 +01:00
Jesper Wilhelmsson
b14eca8aac Merge 2014-12-08 18:52:03 +01:00
Tatiana Pivovarova
a7ebb442cf 8066250: compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java fails product 
Reviewed-by: kvn, thartmann
 2014-12-08 18:21:02 +03:00
Stefan Karlsson
81f94a04b9 Merge 2014-12-08 15:17:39 +00:00
Yumin Qi
bb30bd7e0a Merge 2014-12-08 00:15:55 -08:00
Mikael Vidstedt
aab03b0768 Merge 2014-12-06 04:30:00 +00:00
Alejandro Murillo
db929c3598 Merge 2014-12-05 16:36:07 -08:00
Chris Plummer
8bb3ef2ca0 8066508: JTReg tests timeout on slow devices when run using JPRT 
Fixed by increasing timeoutFactor from 1 to 4 as is done already in jdk/test/Makefile.

Reviewed-by: dholmes, dcubed
 2014-12-05 15:41:51 -08:00
Coleen Phillimore
d1414caa19 Merge 2014-12-05 23:21:29 +00:00
Calvin Cheung
701b666284 8065050: vm crashes during CDS dump when very small SharedMiscDataSize is specified 
Define minimum required sizes for the ro, rw, and md regions and make sure the specified sizes are not less than the minimum sizes

Reviewed-by: jiangli, dholmes, mseledtsov
 2014-12-05 12:24:10 -08:00
Stefan Karlsson
e9b92ce024 8065634: Crash in InstanceKlass::clean_method_data when _method is NULL 
Reviewed-by: coleenp, hseigel, poonam
 2014-12-05 21:16:45 +01:00
Coleen Phillimore
4b628f1aee 8066171: Out of order with Metaspace allocation lock 
Lock resolved_references instead.

Reviewed-by: twisti, sspitsyn
 2014-12-05 15:15:13 -05:00
Roland Westrelin
5974dd3005 8066775: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 
Bad assumption on graph shape in CastIINode::Value if that part of the graph is becoming dead.

Reviewed-by: kvn
 2014-12-05 18:03:15 +01:00
Lana Steuck
dde575d755 Merge 2014-12-04 15:21:31 -08:00
Ioi Lam
ea256a978f 8066670: PrintSharedArchiveAndExit does not exit the VM when the archive is invalid 
In FileMapInfo::fail_continue do not set UseSharedSpaces = false

Reviewed-by: dholmes, ccheung
 2014-12-04 15:20:09 -08:00
Igor Ignatyev
36ab0d5c9a 8066713: ignore compiler/types/correctness 
Add @ignore to compiler/types/correctness tests

Reviewed-by: kvn
 2014-12-04 14:14:09 -08:00
David Katleman
7ef6f7a868 Added tag jdk9-b41 for changeset 47f369e3c69c 2014-12-04 12:58:13 -08:00
David Chase
32897d3cd3 Merge 2014-12-04 17:53:36 +00:00
David Chase
0b7c6dc57c Merge 2014-12-04 11:35:09 -05:00
Kevin Walls
a0b9a703fc Merge 2014-12-04 16:16:01 +00:00
Mikael Gerdin
44dd635112 Merge 2014-12-04 15:09:18 +01:00
Kevin Walls
5c410f0bb5 8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge 
Reviewed-by: sla, dsamersoff
 2014-12-04 12:43:45 +00:00
Roland Westrelin
349669a9de Merge 2014-12-04 11:22:05 +00:00
Bengt Rutisson
902d2139f6 Merge 2014-12-04 09:43:12 +00:00
Jesper Wilhelmsson
9b430f2262 Merge 2014-12-04 10:40:19 +01:00
Goetz Lindenmaier
7a3496218a 8066662: Fix include after 8065993: Merge OneContigSpaceCardGeneration with TenuredGeneration 
Reviewed-by: mgerdin, brutisso
 2014-12-04 10:10:52 +01:00
Tobias Hartmann
f9806ff009 8066448: SmallCodeCacheStartup.java exits with exit code 1 
Check for VirtualMachineError in case VM initialization fails.

Reviewed-by: kvn
 2014-12-04 09:52:15 +01:00
Yumin Qi
9767fa7cb2 Merge 2014-12-03 20:32:33 -08:00
Kevin Walls
4169c68769 8039995: Test serviceability/sa/jmap-hashcode/Test8028623.java fails on some Linux/Mac machines 
Reviewed-by: dsamersoff, allwin, sla
 2014-12-03 20:40:00 +00:00
Chris Hegarty
7e65ec970c Merge 2014-12-03 17:48:58 +00:00
Staffan Friberg
4b3a02ee0b 8066441: Add PLAB trace event 
Reviewed-by: tschatzl, ehelin, egahlin
 2014-12-03 09:27:24 -08:00
Thomas Stuefe
7a2bd82482 8065788: os::reserve_memory() on Windows should not assert that allocation size is aligned to OS allocation granularity 
Reviewed-by: mgronlun, simonis
 2014-12-03 17:12:25 +01:00
Chris Hegarty
393a39afe3 8049367: Modular Run-Time Images 
Co-authored-by: Alan Bateman <alan.bateman@oracle.com>
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Bradford Wetmore <bradford.wetmore@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Paul Sandoz <paul.sandoz@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
 2014-12-03 14:21:14 +00:00
Vladimir Kozlov
65fe921d3d 8066199: C2 escape analysis prevents VM from exiting quickly 
Check for safepoint and block during EA Connection graph construction.

Reviewed-by: roland, vlivanov, shade
 2014-12-02 12:24:31 -08:00
Igor Ignatyev
fd0dba3fc7 8066290: Port JDK-8066191 into hotspot 
Reviewed-by: kvn
 2014-12-02 12:37:01 +03:00
Igor Ignatyev
3a9c14c70a 8064669: compiler/whitebox/AllocationCodeBlobTest.java crashes / asserts 
Reviewed-by: kvn, anoll
 2014-12-02 12:36:03 +03:00
Erik Helin
cbe8efabfe 8059066: CardTableModRefBS might commit the same page twice 
Reviewed-by: tschatzl, kbarrett, jmasa
 2014-12-02 09:53:30 +01:00
Igor Ignatyev
768b1d81a0 Merge 2014-12-01 22:41:16 +03:00
Tatiana Pivovarova
0fccf46ae4 8066141: compiler/whitebox/GetNMethodTest.java: java.lang.RuntimeException: blob_type[MethodProfiled] for 2 level isn't MethodNonProfiled 
Reviewed-by: iveresov, iignatyev
 2014-12-01 22:38:29 +03:00
David Chase
2080004ef0 8064524: Compiler code generation improvements 
Reviewed-by: jrose, acorn, vlivanov
 2014-12-01 13:06:20 -05:00
Vladimir Kempik
4e46878062 8058935: CPU detection gives 0 cores per cpu, 2 threads per core in Amazon EC2 environment 
Reviewed-by: kvn, dsamersoff
 2014-12-01 18:22:45 +04:00
Max Ockner
91dbd4f088 8060074: os::free() takes MemoryTrackingLevel but doesn't need it 
Cleaned up unused arguments in os::free and it's callers.

Reviewed-by: lfoltan, coleenp, ctornqvi, dholmes
 2014-12-01 12:16:15 -05:00
Bengt Rutisson
5c41d82d78 8065993: Merge OneContigSpaceCardGeneration with TenuredGeneration 
Reviewed-by: mgerdin, kbarrett
 2014-12-01 14:37:25 +01:00
Bengt Rutisson
ca3e287e96 8065992: Change CMSCollector::_young_gen to be a ParNewGeneration* 
Reviewed-by: mgerdin, kbarrett
 2014-12-02 09:51:16 +01:00
Jesper Wilhelmsson
4fafece403 Merge 2014-12-01 12:11:11 +01:00
Roland Westrelin
686e5a0a6f 8064703: crash running specjvm98's javac following 8060252 
Uncommon trap between arraycopy and initialization may leave array initialized

Reviewed-by: kvn, vlivanov, goetz
 2014-12-01 11:59:56 +01:00
Igor Ignatyev
349a740fef Merge 2014-11-28 18:37:20 +00:00
Igor Ignatyev
0ca96a4047 Merge 2014-11-28 16:59:12 +00:00
Filipp Zhinkin
23b769e30e 8058846: c.o.j.t.Platform::isX86 and isX64 may simultaneously return true 
Reviewed-by: iveresov, iignatyev
 2014-11-28 19:49:16 +03:00
Tatiana Pivovarova
4e55928faf 8064953: Asserts.assert* should print values 
Reviewed-by: sla, dholmes, iignatyev
 2014-11-28 19:42:10 +03:00
Jaroslav Bachorik
6c1cf6ba45 8065783: DCMD parser fails to recognize one character argument when it's positioned last 
Reviewed-by: sla, egahlin, fparain
 2014-11-28 16:33:57 +01:00
Thomas Schatzl
77f5cb9219 Merge 2014-11-28 08:53:48 +00:00
Leonid Mesnik
c8a147b8c7 8065579: WB method to start G1 concurrent mark cycle should be introduced 
Add a WhiteBox callback to the VM to start a concurrent mark cycle in G1.

Reviewed-by: tschatzl, sjohanss
 2014-11-28 09:33:48 +01:00
Bengt Rutisson
d8635f58cd 8066133: Fix missing reivew changes for JDK-8065972 
Reviewed-by: mgerdin, stefank
 2014-11-28 08:20:52 +01:00
Bengt Rutisson
0ecc753586 8065972: Remove support for ParNew+SerialOld and DefNew+CMS 
Reviewed-by: mgerdin, stefank
 2014-11-27 21:02:13 +01:00
David Chase
e7cf10b9eb Merge 2014-11-27 11:33:04 -05:00
Roland Westrelin
6d20d3298a 8066045: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1 
Code in PhaseIterGVN::add_users_to_worklist() from 8054478 makes incorrect assumption about graph shape

Reviewed-by: iveresov
 2014-11-27 16:54:49 +01:00
Stefan Johansson
02adde2aac 8065227: Report allocation context stats at end of cleanup 
Moved allocation context update from remark to the cleanup phase.

Reviewed-by: mgerdin, jmasa
 2014-11-27 11:09:55 +01:00
Evgeniya Stepanova
e635ae96cb 8065865: gc/TestSoftReferencesBehaviorOnOOME.java: Error. Can't find source file: TestSoftReference.java 
Reviewed-by: sla
 2014-11-27 14:52:01 +04:00
Sangheon Kim
1ffc316e18 8055239: assert(_thread == Thread::current()->osthread()) failed: The PromotionFailedInfo should be thread local 
Changed to trace and reset before second use of PromotionFailedInfo.

Reviewed-by: jmasa, brutisso, kbarrett
 2014-11-26 21:38:25 -08:00
David Chase
bd885cddf0 Merge 2014-11-26 20:38:10 -05:00
Jesper Wilhelmsson
d4c7f00306 Merge 2014-11-26 20:36:36 +00:00
Yumin Qi
d1c1ac6cd9 Merge 2014-11-26 19:46:33 +00:00
Yumin Qi
bfefbe8ba4 Merge 2014-11-26 18:47:23 +00:00
Yumin Qi
d620b54c63 8053995: Add method to WhiteBox to get vm pagesize 
Unsafe is not recommended and may deprecated in future. Added a WhiteBox API to get VM page size.

Reviewed-by: dholmes, ccheung, mseledtsov
 2014-11-26 10:32:21 -08:00
Jon Masamitsu
47d94bfc2f Merge 2014-11-26 17:43:48 +00:00
Jesper Wilhelmsson
11267d8d06 Merge 2014-11-26 17:24:57 +00:00
Jesper Wilhelmsson
3c3e60d5be Merge 2014-11-26 18:01:10 +01:00
Erik Helin
09ae36fd33 8065656: Use DWARF debug symbols for Solaris 
Reviewed-by: dcubed, huntch, pbk
 2014-11-26 17:32:39 +01:00
Filipp Zhinkin
5e21021117 8037968: Add tests on alignment of objects copied to survivor space 
Reviewed-by: jmasa, dfazunen
 2014-11-26 14:17:06 +04:00
Mikael Gerdin
b5ef32af36 8065358: Refactor G1s usage of save_marks and reduce related races 
Stop using save_marks in G1 related code and make setting the replacement field less racy.

Reviewed-by: brutisso, tschatzl
 2014-11-26 10:53:31 +01:00
Mikael Gerdin
d65f3c41b7 8065218: Move CMS-specific fields from Space to CompactibleFreeListSpace 
Reviewed-by: brutisso, tschatzl, sangheki
 2014-11-26 10:51:52 +01:00
Tobias Hartmann
137d39454d 8007993: hotspot.log w/ enabled LogCompilation can be an invalid XML 
Open compilation log files in write-mode and close before deletion attempt.

Reviewed-by: vlivanov
 2014-11-26 08:06:58 +01:00
David Holmes
26dc1466b7 8035663: Suspicious failure of test java/util/concurrent/Phaser/FickleRegister.java 
Reviewed-by: shade, coleenp
 2014-11-25 21:00:21 -05:00
Roland Westrelin
15dcd41e87 6898462: The escape analysis with G1 cause crash assertion src/share/vm/runtime/vframeArray.cpp:94 
OOM during reallocation of scalar replaced objects in deoptimization causes crashes

Reviewed-by: kvn, jrose
 2014-11-25 17:33:59 +01:00
Niclas Adlertz
53f42d325b Merge 2014-12-05 15:16:01 +01:00
Roland Westrelin
1976f161a5 Merge 2014-12-04 14:11:11 +00:00
Roland Westrelin
07537703cc 8048170: Test closed/java/text/Normalizer/ConformanceTest.java failed 
PhaseIdealLoop::split_if_with_blocks_post() shoulnd't reorder range checks adjusted by range check smearing

Reviewed-by: kvn, jrose
 2014-12-04 14:34:11 +01:00
Goetz Lindenmaier
bdefb9e250 8065915: Fix includes after 8058148: MaxNodeLimit and LiveNodeCountInliningCutoff 
Reviewed-by: vlivanov, dholmes
 2014-11-25 15:59:42 +01:00
Jesper Wilhelmsson
1da0a96993 8065305: Make it possible to extend the G1CollectorPolicy 
Added a G1CollectorPolicyExt where it is possible to extend the class.

Reviewed-by: sjohanss, tschatzl
 2014-11-25 13:41:08 +01:00
Ivan Gerasimov
5ffd65a731 8064694: Kitchensink: WaitForMultipleObjects failed in hotspot\src\os\windows\vm\os_windows.cpp: 3844 
Increase the timeout in debug builds; raise the priority of exiting threads

Reviewed-by: dcubed, dholmes
 2014-11-25 14:16:32 +03:00
Staffan Larsen
c44953a395 Merge 2014-11-24 09:57:02 +01:00
Alejandro Murillo
ee49c27e76 Merge 2014-11-21 08:00:31 -08:00
Tatiana Pivovarova
585ca822b8 8064696: compiler/startup/SmallCodeCacheStartup.java doesn't check exit code 
Reviewed-by: kvn, anoll, iignatyev
 2014-11-21 17:28:29 +03:00
Igor Ignatyev
bf5546e48d 8059550: JEP-JDK-8043304: Test task: segment overflow w/ empty others 
Reviewed-by: kvn, thartmann, iignatyev
 2014-11-21 17:27:11 +03:00
Lana Steuck
752f6b08a0 Merge 2014-11-20 10:57:38 -08:00
Alexander Harlap
aba13c04f2 8059492: Wrong spelling in assert: "Not initialied properly?" 
Fixed typo in metaspace assert message

Reviewed-by: mgerdin
 2014-11-20 10:03:22 -05:00
Tobias Hartmann
5ef6d4e99d 8050079: crash while compiling java.lang.ref.Finalizer::runFinalizer 
Ignore non-instance Klasses in the subclass hierarchy.

Reviewed-by: kvn, iignatyev, jrose
 2014-11-20 11:06:26 +01:00
Ioi Lam
68c088e66f 8065346: WB_AddToBootstrapClassLoaderSearch calls JvmtiEnv::create_a_jvmti when not in _thread_in_vm state 
Removed ThreadToNativeFromVM and use java_lang_String::as_utf8_string instead

Reviewed-by: dholmes, minqi
 2014-11-19 19:31:13 -08:00
Coleen Phillimore
4151db8bfd 8042235: redefining method used by multiple MethodHandles crashes VM 
Note all MemberNames created on internal list for adjusting method entries.

Reviewed-by: sspitsyn, dcubed, lfoltan
 2014-11-19 13:02:11 -05:00
Andrey Zakharov
5b5a52cd58 8059661: Test SoftReference and OOM behavior 
Reviewed-by: tschatzl
 2014-11-19 19:22:49 +04:00
Markus Grönlund
ac5d9dad16 8065361: Fixup headers and definitions for INCLUDE_TRACE 
Reviewed-by: sla, stefank
 2014-11-19 16:08:01 +01:00
Evgeniya Stepanova
b83ddbef42 8062537: [TESTBUG] Conflicting GC combinations in hotspot tests 
Reviewed-by: brutisso
 2014-11-19 17:43:19 +03:00
David Katleman
785151164a Added tag jdk9-b40 for changeset e549997f615f 2014-11-18 15:25:14 -08:00
Zoltan Majo
68b0d32b05 8062854: move compiler jtreg test to corresponding subfolders and use those in TEST.groups 
Move all test from <bug_id> directories to <functional_dir_name>/<bug_id>; update TEST.groups to execute more tests

Reviewed-by: drchase, kvn
 2014-11-18 19:44:45 +01:00
Ioi Lam
ef64d5393d 8064701: Some CDS optimizations should be disabled if bootclasspath is modified by JVMTI 
Added API to track bootclasspath modification

Reviewed-by: jiangli, dholmes, minqi
 2014-11-18 03:38:50 -08:00
Poonam Bajaj
ae592ef688 Merge 2014-11-18 20:51:55 +00:00
Poonam Bajaj
1de1806455 8065220: Include alternate sa.make file for MacOSX 
Include alternate sa.make in make/bsd/makefiles/sa.make

Reviewed-by: mgronlun, egahlin, sla
 2014-11-18 10:19:04 -08:00
Severin Gehwolf
8a5d63f3a2 8064815: Zero+PPC64: Stack overflow when running Maven 
Reviewed-by: kvn, simonis
 2014-11-18 19:17:16 +01:00
Vladimir Ivanov
10999c6095 Merge 2014-11-17 23:11:40 +00:00
Vladimir Ivanov
f3d9096e4d 8062258: compiler/debug/TraceIterativeGVN.java segfaults in trace_PhaseIterGVN 
Reviewed-by: kvn
 2014-11-17 14:02:45 -08:00
Gerald Thornbrugh
3f915eeafd 8050807: Better performing performance data handling 
Reviewed-by: dcubed, pnauman, ctornqvi, dholmes, mschoene
 2014-11-17 15:51:46 -05:00
Igor Ignatyev
f81bd8ff29 8059732: improve hotspot_*test targets 
Reviewed-by: kvn, dholmes
 2014-11-17 12:57:49 +03:00
Andrey Zakharov
da1287a38f 8064716: TestHumongousShrinkHeap.java can not be run with -XX:+ExplicitGCInvokesConcurrent 
8062957: Heap is not shrunk when deallocating under memory pressure

Added explicit -XX:-ExplicitGCInvokesConcurrent to invocations

Reviewed-by: brutisso, tschatzl
 2014-11-14 17:36:56 +04:00
Alejandro Murillo
e2cd480dee Merge 2014-11-13 16:11:00 -08:00
Lana Steuck
7a9938e29c Merge 2014-11-13 09:38:49 -08:00
David Chase
f454e5e02c Merge 2014-11-13 11:35:15 -05:00
Gunter Haug
8e5771854a 8064471: Port 8013895: G1: G1SummarizeRSetStats output on Linux needs improvement to AIX 
Reviewed-by: dholmes, simonis
 2014-11-13 16:58:56 +01:00
Thomas Stuefe
c96487313b 8064779: Add additional comments for "8062370: Various minor code improvements" 
Provide additional comments to jio_snprintf and jio_vsnprintf

Reviewed-by: simonis, coleenp, mgronlun
 2014-11-17 11:26:43 -05:00
Staffan Larsen
c217bdda86 Merge 2014-11-17 09:36:40 +01:00
Coleen Phillimore
6ea8243276 Merge 2014-11-15 02:51:48 +00:00
Coleen Phillimore
95e4545589 Merge 2014-11-15 01:38:35 +00:00
Coleen Phillimore
2989453543 Merge 2014-11-15 01:29:25 +00:00
Coleen Phillimore
2488d9b005 Merge 2014-11-14 15:08:28 -05:00
Max Ockner
54d2060d42 8060449: Obsolete command line flags accept arbitrary appendix 
Proper error messages for newly obsolete command line flags.

Reviewed-by: lfoltan, dcubed, coleenp
 2014-11-14 13:09:53 -05:00
Eric McCorkle
3e575a7078 8064571: java/lang/instrument/IsModifiableClassAgent.java: assert(length > 0) failed: should only be called if table is present 
Remove tautological assert

Reviewed-by: coleenp, lfoltan, sspitsyn, jiangli
 2014-11-14 12:45:55 -05:00
Daniel D. Daugherty
b259ede692 8033602: wrong stabs data in libjvm.debuginfo on JDK 8 - SPARC 
8034005: cannot debug in synchronizer.o or objectMonitor.o on Solaris X86

Solaris needs objcopy version of 2.21.1 or newer is needed to create valid .debuginfo files.

Reviewed-by: dsamersoff, sspitsyn, dholmes, ihse
 2014-11-13 10:39:35 -08:00
Aleksey Shipilev
8f3190b805 8064749: -XX:-UseCompilerSafepoints breaks safepoint rendezvous 
Reviewed-by: dcubed, coleenp, kvn, dholmes
 2014-11-13 19:12:28 +03:00
Nils Eliasson
bc52e8443e 8061256: com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java timed out 
Must not be at safepoint when taking CompileQueue_lock

Reviewed-by: kvn, anoll
 2014-11-13 14:42:54 +01:00
Jesper Wilhelmsson
c72d5c48e2 Merge 2014-11-13 12:29:09 +01:00
Roland Westrelin
4bc2edad15 8054478: C2: Incorrectly compiled char[] array access crashes JVM 
Dead backbranch in main loop results in erroneous array access

Reviewed-by: kvn, iveresov
 2014-11-13 09:19:46 +01:00
Vladimir Ivanov
5a00d5f6b5 8058148: MaxNodeLimit and LiveNodeCountInliningCutoff 
Reviewed-by: kvn, roland
 2014-11-24 07:29:03 -08:00
Tobias Hartmann
9adb455ba8 8065339: Failed compilation does not always trigger a JFR event 'CompilerFailure' 
CompilerFailure JFR event should be triggered in ciEnv.

Reviewed-by: kvn
 2014-11-24 08:48:15 +01:00
David Chase
ff95f67cce Merge 2014-11-22 03:10:33 +00:00
David Chase
54b5c3864e Merge 2014-11-21 21:08:48 -05:00
Vladimir Kozlov
f36e847523 8065618: C2 RA incorrectly removes kill projections 
Don't remove KILL projections if their "defining" nodes have SCMemProj projection (memory side effects).

Reviewed-by: iveresov
 2014-11-21 17:17:41 -08:00
Staffan Larsen
8adbb0b63a Merge 2014-11-13 07:58:28 +01:00
David Katleman
e6c564c97f Added tag jdk9-b39 for changeset 4d506c3aaee1 2014-11-12 20:32:23 -08:00
Coleen Phillimore
a44e4f2067 Merge 2014-11-13 03:48:47 +00:00
Calvin Cheung
7942d78cb9 Merge 2014-11-13 02:09:11 +00:00
Coleen Phillimore
2993751669 Merge 2014-11-12 20:18:13 -05:00
Coleen Phillimore
1b8924bdb6 Merge 2014-11-13 00:40:07 +00:00
Calvin Cheung
1f7d2d4c0d 8043491: warning LNK4197: export '... ...' specified multiple times; using first specification 
No need to use the /export linker option on windows 64-bit platform

Reviewed-by: ctornqvi, minqi
 2014-11-12 16:22:12 -08:00
David Holmes
959631d58d 8062307: 'Reference handler' thread triggers assert w/ TraceThreadEvents 
Removed unused and non-working TraceThreadEvents option

Reviewed-by: coleenp, jiangli
 2014-11-12 19:05:59 -05:00
Aleksey Shipilev
f8712e7800 8059677: Thread.getName() instantiates Strings 
Reviewed-by: coleenp, dholmes, sla
 2014-11-13 01:57:09 +03:00
Jiangli Zhou
afd3405c2f 8054008: Using -XX:-LazyBootClassLoader crashes with ACCESS_VIOLATION on Win 64bit 
Only enable the assert for current_stack_pointer after stub routines become available.

Reviewed-by: dholmes, roland, lfoltan
 2014-11-12 13:12:35 -05:00
Jiangli Zhou
c4806e0186 Merge 2014-11-11 14:52:50 -05:00
Jiangli Zhou
0bad624124 Merge 2014-11-11 19:42:52 +00:00
Coleen Phillimore
629b0a66ee Merge 2014-11-11 18:00:06 +00:00
Jiangli Zhou
7251d384ac Merge 2014-11-11 16:54:24 +00:00
Coleen Phillimore
d6de951947 8062870: src/share/vm/services/mallocTracker.hpp:64 assert(_count > 0) failed: Negative counter 
Signed bitfield size y can only have (1 << y)-1 values.

Reviewed-by: shade, dholmes, jrose, ctornqvi, gtriantafill
 2014-11-11 09:59:50 -05:00
Vladimir Ivanov
3e0d07ed5c 8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv 
Reviewed-by: kvn, roland, coleenp, mgerdin
 2014-11-11 04:46:13 -08:00
Dmitry Samersoff
fb8f27e2af 8059131: sawindbg.dll is not compiled with /SAFESEH 
Make variable SAFESEH_FLAG replaced with /SAFESEH link option.

Reviewed-by: mgronlun, sla
 2014-11-11 04:34:56 -08:00
Aleksey Shipilev
21527b2ff2 8015272: Make @Contended within the same group to use the same oop map 
Reviewed-by: coleenp, dholmes
 2014-11-11 15:07:09 +03:00
Tobias Hartmann
00aa20db4a 8056071: compiler/whitebox/IsMethodCompilableTest.java fails with 'method() is not compilable after 3 iterations' 
Always use MDO if valid and always compile trivial methods with C1 if available.

Reviewed-by: kvn, iveresov
 2014-11-11 11:05:41 +01:00
Jiangli Zhou
9b1628d0b5 Merge 2014-11-10 19:52:28 -05:00
Eric McCorkle
cba5bd2638 8058322: Zero name_index item of MethodParameters attribute cause MalformedParameterException 
Allow hotspot to report null for 0 parameter_name index in MethodParameters attribute

Reviewed-by: coleenp, dholmes
 2014-11-10 19:37:32 -05:00
Jiangli Zhou
4f4c4bbd5c 8064375: Change certain errors to warnings in CDS output 
Change CDS non-fatal preloading errors to warnings.

Reviewed-by: minqi, mseledtsov, coleenp
 2014-11-10 19:28:51 -05:00
Eric McCorkle
bbd7b058d1 8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException 
Allow hotspot to store and report zero-length MethodParameters attribute data

Reviewed-by: coleenp, jiangli
 2014-11-10 16:45:46 -05:00
Calvin Cheung
5ccaf44879 8060721: Test runtime/SharedArchiveFile/LimitSharedSizes.java fails in jdk 9 fcs new platforms/compiler 
Replaced strcat() with jio_snprintf()

Reviewed-by: dholmes, iklam, dlong, minqi
 2014-11-10 10:13:10 -08:00
Igor Ignatyev
bdac822811 8059624: Test task: WhiteBox API for testing segmented codecache feature 
Reviewed-by: kvn, thartmann
 2014-11-10 19:04:38 +03:00
Tatiana Pivovarova
80830d4932 8062742: compiler/EliminateAutoBox/UnsignedLoads.java fails with client vm 
Reviewed-by: kvn, rbackman, anoll, vlivanov, iignatyev
 2014-11-08 16:00:28 +03:00
Tatiana Pivovarova
dda16f6ccd 8062011: JT_HS/compiler/7068051 uses jre/lib/javaws.jar 
Reviewed-by: kvn, iignatyev
 2014-11-08 16:00:27 +03:00
Yumin Qi
1768fe1eb9 8062247: [TESTBUG] Allow WhiteBox test to access JVM offsets 
Reviewed-by: coleenp, iklam, mseledtsov
 2014-11-07 12:48:09 -08:00
David Chase
fbe3993153 Merge 2014-11-07 13:58:52 -05:00
Alejandro Murillo
0aa14570e8 Merge 2014-11-07 06:35:23 -08:00
Staffan Larsen
33477d9cac Merge 2014-11-07 13:50:55 +01:00
Daniel D. Daugherty
d7ec650456 8062851: cleanup ObjectMonitor offset adjustments 
JEP-143/JDK-8046133 - cleanup computation of ObjectMonitor field pointers

Reviewed-by: dholmes, redestad, coleenp
 2014-11-06 13:05:14 -08:00
Staffan Larsen
bcb6a1586a Merge 2014-11-06 19:59:32 +00:00
David Katleman
baf9de8bf6 Added tag jdk9-b38 for changeset 8cc25b0f95a0 2014-11-06 10:11:35 -08:00
Coleen Phillimore
8a90e389bd Merge 2014-11-06 13:57:26 +00:00
David Buck
5b4d655ce3 Merge 2014-11-06 08:18:10 +00:00
David Buck
af50fa526b 8058715: stability issues when being launched as an embedded JVM via JNI 
Use mmap call without MAP_FIXED so we avoid corrupting already allocated memory

Reviewed-by: coleenp, dsimms
 2014-11-05 23:37:17 -08:00
Albert Noll
4af87513d4 8062735: CodeCacheSweeperThread missing from SA 
Make SA aware of the code cache sweeper thread

Reviewed-by: kvn, coleenp, sspitsyn
 2014-11-06 07:27:25 +01:00
Jiangli Zhou
75778598e2 Merge 2014-11-06 01:31:31 +00:00
Jeremy Manson
54e9fee4d2 8062116: JVMTI GetClassMethods is Slow 
Allocate enough space for all jmethodids; make adding a jmethodid O(1)

Reviewed-by: coleenp, rasbold, sspitsyn
 2014-11-05 16:47:37 -08:00
Coleen Phillimore
78aaa377f4 Merge 2014-11-06 00:01:33 +00:00
Chris Plummer
7a414a2c7d 8043770: File leak in MemNotifyThread::start() in hotspot.src.os.linux.vm.os_linux.cpp 
Fixed by removing all code related to LowMemoryProtection, which removed offending code.

Reviewed-by: dholmes, minqi
 2014-11-05 13:00:59 -08:00
George Triantafillou
b4138cce10 8061969: [TESTBUG] MallocSiteHashOverflow.java should be enabled for 32-bit platforms 
Reviewed-by: ctornqvi, coleenp
 2014-11-05 08:22:17 -08:00
Christian Tornqvist
76971f377b 8058251: assert(_count > 0) failed: Negative counter when running runtime/NMT/MallocTrackingVerify.java 
Fixed an issue when overflowing the MallocSite hash table bucket

Reviewed-by: coleenp, gtriantafill
 2014-11-05 13:20:09 -08:00
Christian Tornqvist
d934df8a84 8061733: [TESTBUG] Exclude tests that have issues with Jigsaw M2 changes 
[TESTBUG] Exclude tests that have issues with Jigsaw M2 changes

Reviewed-by: lfoltan, gtriantafill
 2014-11-05 13:18:51 -08:00
Martin Doerr
d4fc9133ab 8062950: Bug in locking code when UseOptoBiasInlining is disabled: assert(dmw->is_neutral()) failed: invariant 
Reviewed-by: dholmes, kvn
 2014-11-05 16:28:11 +01:00
Zoltan Majo
49b224a4f7 8057622: java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest: SEGV inside compiled code (sparc) 
In Parse::array_store_check(), add control edge FROM IfTrue branch of runtime type check of the destination array TO loading _element_klass from destination array.

Reviewed-by: kvn, roland, anoll
 2014-11-06 09:40:58 +01:00
Igor Veresov
8db9a55e68 8062591: SPARC PICL causes significantly longer startup times 
Optimize traversals of the PICL tree

Reviewed-by: kvn
 2014-11-04 07:09:34 -10:00
Christian Tornqvist
f048251de8 8059803: Update use of GetVersionEx to get correct Windows version in hs_err files 
Update use of GetVersionEx to get correct Windows version in hs_err files

Reviewed-by: dcubed, gtriantafill
 2014-11-03 11:34:13 -08:00
Jaroslav Bachorik
f52a43892a 8061616: HotspotDiagnosticMXBean.getVMOption() throws IllegalArgumentException for flags of type double 
Reviewed-by: mchung, sla
 2014-11-03 11:19:43 +01:00
Daniel D. Daugherty
c6b9495b55 Merge 2014-10-31 18:18:58 +00:00
Daniel D. Daugherty
2730e1ad50 Merge 2014-10-31 10:15:29 -07:00
David Buck
f27723c08b 8060169: Update the Crash Reporting URL in the Java crash log 
Update the URL for HotSpot bug reports.

Reviewed-by: dcubed, rdurbin
 2014-10-31 09:37:17 -07:00
Jesper Wilhelmsson
752ab53592 Merge 2014-10-31 08:00:09 +00:00
Alejandro Murillo
73fa4d8c8a Merge 2014-10-30 22:52:13 -07:00
Lana Steuck
6c8da71920 Merge 2014-10-30 13:57:02 -07:00
Igor Veresov
5870a5b77b Merge 2014-10-30 09:50:16 -10:00
David Katleman
6adc3da841 Added tag jdk9-b37 for changeset 566704615ade 2014-10-30 08:34:54 -07:00
Tobias Hartmann
fe1762fbd6 8061817: Whitebox.deoptimizeMethod() does not deoptimize all OSR versions of method 
Fixed Whitebox.deoptimizeMethod() to deoptimize all OSR versions of the method.

Reviewed-by: kvn, iignatyev
 2014-10-30 13:03:30 +01:00
Jesper Wilhelmsson
1486e4bf7d Merge 2014-10-30 01:01:37 +01:00
Albert Noll
8aa05f7690 8062284: Sweeper thread should not be visible when calling Thread.getAllStackTraces() 
Make thread not visible when calling Thread.getAllStackTraces()

Reviewed-by: kvn, shade
 2014-10-29 15:42:48 +01:00
Goetz Lindenmaier
0aa09022fa 8062370: Various minor code improvements 
A lot of fixes useful to improve the code quality.

Reviewed-by: coleenp, dholmes
 2014-10-29 10:13:24 +01:00
Coleen Phillimore
63080521d7 8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise 
8044209: nsk/split_verifier/security/coglio06 fails with exit code 97 - missing 'prohibited package name'

Fix resolution error saving.

Reviewed-by: lfoltan, sspitsyn, hseigel, ctornqvi
 2014-10-28 17:02:08 -04:00
Nils Eliasson
897d6c5c9b 8061250: serviceability/dcmd/compiler/CompilerQueueTest.java failed 
Fixed logging to avoid parsing mistake and added test case.

Reviewed-by: kvn, twisti
 2014-10-28 20:16:08 +01:00
Tobias Hartmann
1c866d8433 8062250: [TESTBUG] compiler/codecache/CheckSegmentedCodeCache.java fails after CodeCacheMinimumFreeSpace removal 
Adapted calculation of minimum code cache size after CodeCacheMinimumFreeSpace was removed by JDK-8046809.

Reviewed-by: kvn, anoll
 2014-10-28 16:44:39 +01:00
Vladimir Kempik
24c29c4db4 8059216: Make PrintGCApplicationStoppedTime print information about stopping threads 
Reviewed-by: dholmes, brutisso
 2014-10-28 18:41:34 +04:00
Coleen Phillimore
4c036f5730 8037842: Failing to allocate MethodCounters and MDO causes a serious performance drop 
Stop allocating compiler profiling metadata when metaspace is full.

Reviewed-by: kvn, anoll
 2014-10-30 18:38:42 -04:00
Alex Schenkman
b301b207b3 8062135: serviceability/threads/TestFalseDeadLock.java should be quarantined 
Reviewed-by: sla
 2014-10-28 12:28:58 +01:00
Ivan Gerasimov
14e05b4858 8059533: (process) Make exiting process wait for exiting threads [win] 
Reviewed-by: dholmes, dcubed
 2014-10-29 09:53:56 -07:00
Daniel D. Daugherty
0d3acc8838 8061552: Contended Locking speedup PlatformEvent unpark bucket 
JEP-143/JDK-8046133 - optimization #2 - speedup PlatformEvent unpark bucket.

Co-authored-by: Dave Dice <dave.dice@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Reviewed-by: acorn, dice, dholmes
 2014-10-29 09:19:59 -07:00
Tobias Hartmann
1e7b7a410e 8061983: [TESTBUG] compiler/whitebox/MakeMethodNotCompilableTest.java fails with "must not be in queue" 
Added a method checkNotCompiled(boolean isOsr) to either check if the method is OSR compiled or to check if it is non-OSR compiled.

Reviewed-by: kvn
 2014-10-28 09:17:36 +01:00
Igor Veresov
1af7144df1 Merge 2014-10-27 20:03:57 -10:00
Daniel D. Daugherty
ee1de3ce2f Merge 2014-10-27 15:09:23 -07:00
Kim Barrett
f9d8e2ae9d 8062206: Remove unusable G1RSLogCheckCardTable command line argument 
Remove dependent assertion and remove develop option

Reviewed-by: jwilhelm, mgerdin, tschatzl
 2014-10-27 17:24:10 -04:00
Marcus Larsson
6e148efe69 8064348: Add TraceEvent::is_enabled() for embedded/minimal builds 
Reviewed-by: ehelin, sla
 2014-11-10 12:13:46 +01:00
John Coomes
894e9e8f87 8060467: CMS: small OldPLABSize and -XX:-ResizePLAB cause assert(ResizePLAB || n_blks == OldPLABSize) failed: Error 
Reviewed-by: tschatzl, jmasa, kbarrett
 2014-11-07 15:34:33 -08:00
Mikael Gerdin
bb556024a7 8061964: Insufficient compiler barriers for GCC in OrderAccess functions 
Fix OrderAccess functions to emit memory clobbering inline assembly to attempt to stop copiler reordering.

Reviewed-by: dcubed, dholmes, bdelsart
 2014-11-03 11:08:03 +01:00
Jesper Wilhelmsson
7339456266 8062836: BACKOUT - Parallelize clearing the next mark bitmap 
Backing out due to non-trivial issues found in nightly testing

Reviewed-by: mgerdin, mlarsson
 2014-11-05 15:50:14 +01:00
Erik Helin
0e54928686 8061467: Bad page size passed to setup_large_pages() on Solaris 
Reviewed-by: tschatzl, mgerdin
 2014-11-05 16:39:10 +01:00
Bengt Rutisson
c1bc4be92b 8061449: G1: FreeRegionList_test() fails with G1 after the JDK-8058534 fix to HeapRegion::orig_end() 
Reviewed-by: mgerdin, tschatzl, stefank
 2014-11-05 10:12:51 +01:00
Jesper Wilhelmsson
b59b80b068 Merge 2014-11-03 15:53:48 +01:00
Marcus Larsson
4a9f067587 8049341: Parallelize clearing the next mark bitmap 
Reviewed-by: mgerdin, tschatzl
 2014-11-03 12:49:21 +01:00
Marcus Larsson
fe45f7091b 8054491: Remove wrong assert and refactor code in G1CollectorPolicy::record_concurrent_mark_end 
Reviewed-by: tschatzl, brutisso
 2014-11-03 11:29:00 +01:00
Bengt Rutisson
4601eb634a 8061308: Remove iCMS 
Reviewed-by: mgerdin, jmasa
 2014-10-31 09:10:51 +01:00
Marcus Larsson
5fd7516136 8043243: convert SCAN_AND_FORWARD, SCAN_AND_ADJUST_POINTERS, SCAN_AND_COMPACT macros to methods 
Reviewed-by: mgerdin, kbarrett
 2014-10-30 12:45:22 +01:00
Stefan Johansson
6306dce831 8061234: ResourceContext.requestAccurateUpdate() is unreliable 
Changing copy_allocation_context_stats to return if there are more stats available after the copy.

Reviewed-by: rriggs, jcoomes
 2014-10-30 10:51:06 +01:00
Jesper Wilhelmsson
76db8ade45 Merge 2014-10-27 19:15:23 +00:00
Jesper Wilhelmsson
ca6fb51841 Merge 2014-10-27 20:00:04 +01:00
Jesper Wilhelmsson
5cb1dff557 Merge 2014-10-27 20:00:04 +01:00
Jon Masamitsu
f01e2584c7 Merge 2014-10-27 16:39:29 +00:00