stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,679 Commits 2 Branches 0 Tags 1.2 GiB
378ab9dd25
Commit Graph

11534 Commits

Author SHA1 Message Date
Igor Ignatyev
b298fb9be2 Merge 2016-05-09 23:53:11 +02:00
Robbin Ehn
2523b1942a 8153535: Convert TraceRedefineClasses to Unified Logging 
Reviewed-by: rprotacio, coleenp
 2016-05-09 22:22:15 +02:00
Igor Ignatyev
865ac314a6 Merge 2016-05-09 22:03:04 +02:00
Calvin Cheung
1e6507f1b0 Merge 2016-05-09 21:27:19 +02:00
Calvin Cheung
fef5de6f41 8155574: ClassLoader::initialize_module_loader_map crashes if the char_buf is not NULL terminated 
Reviewed-by: jiangli, iklam
 2016-05-09 12:20:02 -07:00
Jon Masamitsu
2945c4da22 Merge 2016-05-09 17:36:13 +00:00
Marcus Larsson
17dce93f31 8145934: Make ttyLocker equivalent for Unified Logging framework 
Reviewed-by: rprotacio, stuefe, jrose
 2016-05-09 15:46:12 +02:00
Dmitry Samersoff
c052a98d6f Merge 2016-05-10 03:37:36 +00:00
Dmitry Samersoff
f4ffadd18b 8155091: Remove SA related functions from tmtools 
Remove options that enables support for non-cooperative mode

Reviewed-by: alanb, mchung, sla
 2016-05-09 23:41:41 +03:00
Roland Westrelin
a1e5418d19 8154826: AArch64: take advantage better of base + shifted offset addressing mode 
Reshape address subtree to fit aarch64 addressing mode

Reviewed-by: kvn, aph
 2016-05-09 11:34:09 +02:00
Rahul Raghavan
7adc4034cd 8153655: Make intrinsics flags diagnostic and update intrinsics tests to enable diagnostic options 
Converted all intrinsics flags to diagnostic and updated related intrinsics tests to enable diagnostic options

Reviewed-by: kvn
 2016-05-09 01:21:55 -07:00
Yasumasa Suenaga
f2e1814b1a 8156033: jhsdb jmap cannot set heapdump name 
Reviewed-by: dsamersoff
 2016-05-07 10:29:16 +09:00
Claes Redestad
d25ad32507 8150044: Generate classlists at build-time 
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Reviewed-by: alanb, mchung, iklam
 2016-05-07 00:43:37 +02:00
Jon Masamitsu
fbe14c5250 8155992: Change name of StealRegionCompactionTask to something that emphasizes the compaction task 
Reviewed-by: kbarrett, ehelin, drwhite
 2016-05-06 14:35:59 -07:00
Erik Joelsson
baff09847c Merge 2016-05-09 13:55:21 +02:00
Magnus Ihse Bursie
01fcb7adcf 8156018: Hotspot visual studio project generation broken 
Reviewed-by: mgronlun, ctornqvi
 2016-05-09 13:22:39 +02:00
Vladimir Ivanov
5dc9f56544 Merge 2016-05-09 13:13:07 +03:00
Tom Rodriguez
4e7451cd5b Merge 2016-05-06 18:08:01 +00:00
Vladimir Ivanov
71d2f5b46d Merge 2016-05-06 19:45:22 +03:00
Vladimir Ivanov
e704d47b85 Merge 2016-05-06 19:35:23 +03:00
Vladimir Ivanov
e1512b1e15 Merge 2016-05-06 18:37:58 +03:00
Aleksey Shipilev
ffc21de072 8155965: Unsafe.weakCompareAndSetVolatile entry points and intrinsics 
Reviewed-by: psandoz, vlivanov
 2016-05-06 17:59:35 +03:00
Kirill Zhaldybin
bb79607f67 8132710: Add tests which check that Humongous objects behave as expected after Young GC 
8132712: Add tests which check that Humongous objects behave as expected after Full GC

Reviewed-by: jmasa, dfazunen
 2016-05-06 17:51:11 +03:00
Igor Ignatyev
dc12061bb6 8148244: Finalize and integrate GTest implementation 
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Stefan Sarne <stefan.sarne@oracle.com>
Co-authored-by: Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>
Co-authored-by: Erik Helin <erik.helin@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Reviewed-by: jwilhelm, erikj
 2016-05-09 14:15:40 +03:00
Igor Ignatyev
66686b8152 8149591: Prepare hotspot for GTest 
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Stefan Sarne <stefan.sarne@oracle.com>
Co-authored-by: Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>
Co-authored-by: Erik Helin <erik.helin@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Reviewed-by: jwilhelm
 2016-05-09 14:15:39 +03:00
Aleksey Shipilev
9773289026 Merge 2016-05-06 14:44:09 +00:00
Alejandro Murillo
4247e12f6b Merge 2016-05-06 06:23:29 -07:00
Alejandro Murillo
b68bd82d9b Merge 2016-05-06 06:12:56 -07:00
Jamsheed Mohammed C M
08dac03ddc 8156131: C2: MachProj dumps data on tty w/ -XX:+WizardMode 
Made to dump on output stream on wizard mode.

Reviewed-by: vlivanov
 2016-05-06 06:08:15 -07:00
Jamsheed Mohammed C M
88cbbd634e 8156124: Update compiler/unsafe/UnsafeGetConstantField after JDK-8148518 is fixed 
Removed workaround added for 8148518.

Reviewed-by: vlivanov
 2016-05-06 05:57:43 -07:00
Jamsheed Mohammed C M
28efea6754 8156126: LogCompilation: Dump additional info about deoptimization events 
Added reason and pc information to deoptimization info.

Reviewed-by: vlivanov
 2016-05-06 05:42:36 -07:00
Vladimir Ivanov
622a5ae6f0 Merge 2016-05-06 18:20:50 +03:00
Aleksey Shipilev
b3f1f110f4 8156068: Unsafe.{get|set}Opaque should be single copy atomic 
Reviewed-by: psandoz, vlivanov
 2016-05-06 15:41:15 +03:00
Kevin Walls
fc13e59776 Merge 2016-05-06 09:54:58 +00:00
Goetz Lindenmaier
37389f4e60 8156190: [ppc] Fix build after "8151268: Wire up the x86 _vectorizedMismatch stub routine in C1" 
New function was placed within other function.

Reviewed-by: mdoerr
 2016-05-06 09:10:47 +02:00
Tom Rodriguez
b9a1863e45 8156178: [JVMCI] expose StubRoutines trig functions 
Reviewed-by: kvn
 2016-05-05 20:14:46 -07:00
Paul Sandoz
107de3478c 8155794: Move Objects.checkIndex BiFunction accepting methods to an internal package 
Reviewed-by: shade, vlivanov
 2016-05-05 18:14:51 -07:00
Tomasz Wojtowicz
0a123cad8f 8154974: AVX-512 equipped inflate, has_negatives & compress intrinsics 
Reviewed-by: kvn
 2016-05-05 17:16:08 -07:00
Yasumasa Suenaga
05e186869f 8156133: FindCrashesAction in HSDB does not work except Solaris platform 
Reviewed-by: dsamersoff
 2016-05-06 09:13:31 +09:00
Jon Masamitsu
a74454fc1e Merge 2016-05-05 20:11:14 +00:00
Kim Barrett
c90e8fc308 Merge 2016-05-05 21:13:48 +02:00
Lana Steuck
5d72543efb Merge 2016-05-05 19:10:36 +00:00
Paul Sandoz
24b184b665 8155258: VarHandle implementation improvements 
Relax return type check for call to linked method handle invocation

Reviewed-by: shade, vlivanov
 2016-05-05 11:39:23 -07:00
Christian Tornqvist
c44255db9b Merge 2016-05-05 17:53:37 +00:00
Kim Barrett
b260a19e7b 8156072: AllocatedObj msgs coming out during -version etc 
Removed obsolete print.

Reviewed-by: jmasa, ecaspole
 2016-05-05 13:47:46 -04:00
Lana Steuck
0817cd2a01 Added tag jdk-9+117 for changeset 065e8305bdc6 2016-05-05 17:35:47 +00:00
Paul Sandoz
472a1bc607 8151268: Wire up the x86 _vectorizedMismatch stub routine in C1 
Reviewed-by: kvn
 2016-05-05 10:03:26 -07:00
George Triantafillou
88be76356f 8154942: Remove ProcessTools.getVmInputArguments() from the hotspot test library, as it is not used by any of the hotspot tests 
Reviewed-by: ctornqvi, hseigel
 2016-05-05 12:25:29 -04:00
Antonios Printezis
80dc8b84bc 8155257: ParNew/CMS: Clean up promoted object tracking 
Reviewed-by: jmasa, ysr
 2016-05-05 08:51:27 -07:00
Ahmed Khawaja
7057abda29 8155162: java.util.zip.CRC32C Interpreter/C1 intrinsics support on SPARC 
Reviewed-by: kvn
 2016-05-04 15:30:21 -07:00
Jon Masamitsu
05ae0adfe4 8156050: ParallelCompact_test should skip test if UseParallelOldGC is off 
Reviewed-by: drwhite, pliden
 2016-05-04 15:04:15 -07:00
Roland Schatz
08cdde3f7c 8156025: [JVMCI] make HotSpotResolvedObjectTypeImpl.createField non-public 
Reviewed-by: twisti
 2016-05-04 12:06:51 +02:00
Erik Helin
fdc03a7cd8 8156022: Add prediction for cost_per_byte_ms to G1Analytics 
Reviewed-by: sjohanss, mgerdin
 2016-05-04 11:29:05 +02:00
Ioi Lam
565780b7aa 8155239: [TESTBUG] Simple test setup for JVMTI ClassFileLoadHook 
Reviewed-by: cjplummer, mseledtsov
 2016-05-03 07:23:23 -07:00
David Holmes
c68110a135 Merge 2016-05-05 03:53:25 +00:00
Yasumasa Suenaga
e41ab59d63 8153073: UL: Set filesize option with k/m/g 
Reviewed-by: mlarsson, dholmes
 2016-05-04 21:53:01 -04:00
Jiangli Zhou
b74a788987 Merge 2016-05-05 03:04:55 +02:00
Christian Tornqvist
e24c1e8bbd Merge 2016-05-04 23:45:10 +00:00
Jiangli Zhou
9a430638df Merge 2016-05-05 00:56:06 +02:00
Jiangli Zhou
34fe707dad 8155678: ClassLoader::initialize_module_loader_map should only be called when dumping CDS archive 
Make ClassLoader::initialize_module_loader_map explicitly CDS dump time only.

Reviewed-by: ccheung, lfoltan
 2016-05-04 17:32:08 -04:00
Vladimir Ivanov
df9476f5a9 Merge 2016-05-04 21:00:41 +00:00
Vladimir Ivanov
d312e84812 8155751: Some tests miss othervm for main/bootclasspath mode 
Reviewed-by: kvn
 2016-05-04 23:08:43 +03:00
Christian Tornqvist
06e3a5cb60 8156066: Backout JDK-8153892 
Reviewed-by: coleenp, mikael
 2016-05-04 15:32:26 -04:00
Leonid Mesnik
094416e1ec 8155946: Minimal VM fails to built after 8154153: PS: Restore preserved marks in parallel 
Reviewed-by: stefank
 2016-05-04 17:47:05 +03:00
Mikael Gerdin
9cad8a6125 8155943: Move G1Eden/SurvivorRegions into their own source files 
Reviewed-by: sjohanss, ehelin
 2016-05-04 13:12:23 +02:00
Goetz Lindenmaier
1e4b00b1dc 8140594: Various minor code improvements (compiler) 
Various minor code improvements (compiler)

Reviewed-by: thartmann, kvn
 2016-05-03 12:23:06 +02:00
Jamsheed Mohammed C M
96c4dc3210 8144856: fix assert in CompiledStaticCall::set_to_interpreted 
Trivial cleanup in assert code.

Reviewed-by: kvn, goetz, thartmann
 2016-05-09 23:49:22 -07:00
Jamsheed Mohammed C M
4ece44cbfa 8150016: small typo in ciReplay code 
Changed atol to atoi

Reviewed-by: kvn
 2016-05-10 00:17:46 -07:00
Alan Bateman
a503db18fb 8154956: Module system implementation refresh (4/2016) 
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Reviewed-by: acorn, jiangli, ccheung, hseigel
 2016-05-03 09:09:20 +01:00
Cheleswer Sahu
323c1d5dbf 8054326: Confusing message in "Current rem set statistics" 
Reviewed-by: pliden, kevinw
 2016-05-02 13:28:08 +05:30
Roland Westrelin
160798c7e7 8154943: AArch64: redundant address computation instructions with vectorization 
Duplicated i2l nodes can be eliminated to optimize redundant address computations

Reviewed-by: kvn, dlong
 2016-04-29 17:24:16 +02:00
Roland Westrelin
0ab61a6e28 8155717: Aarch64: enable loop superword's unrolling analysis 
Reviewed-by: aph, kvn, mcberg
 2016-05-04 13:32:03 -07:00
Aleksey Shipilev
a8fb392baf 8155739: [TESTBUG] VarHandles/Unsafe tests for weakCAS should allow spurious failures 
Reviewed-by: psandoz, vlivanov, simonis
 2016-05-04 17:17:10 +03:00
Ed Nevill
fbac01c4e5 8155967: aarch64: fix register usage in block zeroing 
Fix array fill stub to use r10 == base and r11 == count

Reviewed-by: aph
 2016-05-03 20:36:17 +00:00
Tom Rodriguez
0091cd268a Merge 2016-05-03 21:28:46 +00:00
Christian Thalinger
2898a8c8f0 Merge 2016-05-03 19:45:44 +00:00
Tom Rodriguez
38df4e48a4 8155771: [JVMCI] expose JVM_ACC_IS_CLONEABLE_FAST 
Reviewed-by: twisti
 2016-05-03 12:15:06 -07:00
Roland Schatz
fc0b590c74 8155735: use strings instead of Symbol* in JVMCI exception stubs 
Reviewed-by: never, twisti
 2016-05-03 11:57:03 +02:00
Goetz Lindenmaier
9722354d37 8155738: C2: fix frame_complete_offset 
During scratch_emit_size wrong value was set. Also set offset of ppc.

Reviewed-by: kvn, dlong
 2016-05-02 14:17:19 -07:00
Dmitrij Pochepko
73db8859bf 8155163: JVMCI: MethodHandleAccessProvider.resolveInvokeBasicTarget implementation doesn't match javadoc 
Reviewed-by: twisti
 2016-05-02 03:24:02 +03:00
Dmitrij Pochepko
7982dafac2 8155244: JVMCI: MemoryAccessProvider.readUnsafeConstant javadoc should be updated for null JavaKind case 
Reviewed-by: twisti
 2016-05-02 03:20:23 +03:00
Ed Nevill
17ee5a98f3 8155790: aarch64: debug VM fails to start after 8155617 
Fix base register to point to end after zeroing

Reviewed-by: aph
 2016-04-30 00:57:04 -07:00
Tom Rodriguez
f1eeebc17e 8154483: update IGV with improvements from Graal 
Reviewed-by: kvn
 2016-04-29 12:56:27 -07:00
Zoltan Majo
528bf589fd 8155653: TestVectorUnalignedOffset.java not pushed with 8155612 
Add missing test.

Reviewed-by: aph, adinn
 2016-04-29 14:32:19 +02:00
Zoltan Majo
17cc8b583e Merge 2016-04-29 13:10:01 +02:00
Zoltan Majo
b5f1bd24d2 Merge 2016-04-29 12:05:31 +02:00
Zoltan Majo
413417522f 8153340: Disallow misconfiguration and improve the consistency of allocation prefetching 
Improve allocation prefetching.

Reviewed-by: kvn
 2016-04-29 08:32:42 +02:00
Lana Steuck
a78f728480 Added tag jdk-9+116 for changeset e29791634c81 2016-04-28 08:26:32 -07:00
Ed Nevill
41258ea37a 8155617: aarch64: ClearArray does not use DC ZVA 
Implement block zero using DC ZVA

Co-authored-by: Long Chen <long.chen@linaro.org>
Reviewed-by: aph
 2016-04-28 13:26:29 +00:00
Tobias Hartmann
06645bc9d5 6941938: Improve array equals intrinsic on SPARC 
Array equals intrinsic should do 8-byte comparison on SPARC.

Reviewed-by: kvn, jrose, mgerdin, twisti
 2016-04-28 17:36:37 +02:00
Roland Westrelin
cca965a11d 8155612: Aarch64: vector nodes need to support misaligned offset 
Add support for misaligned offsets.

Reviewed-by: aph
 2016-04-28 15:24:17 +02:00
Martin Doerr
8f2a47ba2e 8154836: VM crash due to "Base pointers must match" 
Improve the handling of AddP nodes in final graph reshaping.

Reviewed-by: kvn, zmajo
 2016-04-28 10:32:12 +02:00
Tom Rodriguez
593cf3fb16 8152903: [JVMCI] CompilerToVM::resolveMethod should correctly handle private methods in interfaces 
Reviewed-by: iveresov
 2016-04-27 16:20:49 -07:00
Vivek Deshpande
8cb0a98032 8154975: Update for vectorizedMismatch with AVX512 
Reviewed-by: kvn
 2016-04-27 13:37:07 -07:00
Mikael Gerdin
432cff9626 8155634: Clean out old logging and dead code from SurvRateGroup 
Reviewed-by: jmasa, tschatzl, sjohanss
 2016-04-27 16:20:05 +02:00
Mikael Gerdin
512ffd9ded Merge 2016-05-04 10:06:00 +02:00
Vladimir Kozlov
654f1d0efd Merge 2016-05-04 03:19:43 +02:00
Vivek Deshpande
1b213af30c 8155864: api/java_lang/Math/cos_cos6 and sin_sin6 fail 
Reviewed-by: kvn
 2016-05-03 17:11:39 -07:00
Jon Masamitsu
15134d34fc Merge 2016-05-04 00:00:24 +00:00
Jon Masamitsu
6663f0cfed 8155966: Assertion failures when -XX:+UseParallelGC -XX:ParallelGCThreads=1 
Reviewed-by: drwhite, kbarrett
 2016-05-03 16:19:42 -07:00
Stefan Karlsson
0b374990d0 Merge 2016-05-04 00:45:59 +02:00
Stefan Karlsson
f8be292b88 8141501: Problems with BitMap buffer management 
Reviewed-by: pliden, kbarrett
 2016-05-03 22:45:27 +02:00
Daniel D. Daugherty
ac61c34c54 8155958: quarantine failing tests from JDK-8155957 
Reviewed-by: hseigel, gtriantafill, dsamersoff, sspitsyn
 2016-05-03 13:30:40 -07:00
Mikael Gerdin
462ad706f1 8150721: Don't explicitly manage G1 young regions in YoungList 
Reviewed-by: ehelin, sjohanss, tschatzl
 2016-05-03 12:33:10 +02:00
David Holmes
0adae4d914 8154710: [Solaris] Investigate use of in-memory low-resolution timestamps for Java and internal time API's 
Reviewed-by: shade, rriggs, dcubed
 2016-05-02 19:38:15 -04:00
Derek White
46d52062aa 8134889: Kitchensink stress test crashes with out of memory error 
Add a hard max of 16 GC threads (each for concurrent and parallel G1) on 32-bit JVMs.

Reviewed-by: mgerdin, pliden
 2016-05-02 12:14:26 -04:00
Mikael Vidstedt
7933c418de 8153892: Handle unsafe access error directly in signal handler instead of going through a stub 
Reviewed-by: stuefe, dholmes
 2016-05-03 08:12:25 -07:00
Kim Barrett
c4bafa7975 8155524: HotCardCache shouldn't be part of ConcurrentG1Refine 
Make G1CollectedHeap owner of HotCardCache.

Reviewed-by: jmasa, mgerdin, tschatzl
 2016-05-02 12:07:58 -04:00
Jon Masamitsu
b12be07514 Merge 2016-05-02 17:46:08 +00:00
Thomas Schatzl
7e5bce7e90 Merge 2016-05-02 19:43:41 +02:00
Thomas Schatzl
d8aeeee668 Merge 2016-05-02 18:54:09 +02:00
Derek White
56d3ee3dbc Merge 2016-05-02 17:58:42 +02:00
Yu Zhang
547e732790 8154955: Negative Other Time in gc logs due to 'Wait for Root Region Scan' not included 
Move the note_gc_start() call before the wait_for_root_region_scanning() one.

Reviewed-by: kbarrett, tschatzl
 2016-05-02 17:45:19 +02:00
Derek White
081466c0e7 8155754: Quarantine serviceability/tmtools/jstat/GcTest02.java 
Add @ignore 8155570

Reviewed-by: kbarrett, stefank
 2016-05-02 11:18:10 -04:00
Mikael Gerdin
fead1c01cd Merge 2016-05-02 16:53:03 +02:00
Thomas Schatzl
d4bfb42264 8155811: Remove HeapRegionRemSet::_coarse_dirty flag 
Reviewed-by: mgerdin, jmasa
 2016-05-02 14:14:16 +02:00
Thomas Schatzl
461078c649 8155813: Fix indentation in G1RemSetScanState::clear_card_table() 
Reviewed-by: mgerdin
 2016-05-02 14:13:05 +02:00
Severin Gehwolf
a0fa7abd14 8155819: Support non-continuous CodeBlobs in HotSpot broke Zero 
Adjust to CompiledMethod changes.

Reviewed-by: coleenp, rbackman
 2016-05-02 13:39:52 +02:00
Erik Gahlin
6f649fdca0 Merge 2016-05-02 12:44:25 +02:00
Thomas Schatzl
39d3c3f512 8155229: Tune thread usage for live data clearing 
Reviewed-by: mgerdin, drwhite
 2016-05-02 10:24:41 +02:00
Thomas Schatzl
53d670b469 8155233: Lazy coarse map clear 
Only clear the coarse bitmaps of the remembered sets if they were dirtied.

Reviewed-by: jmasa, mgerdin
 2016-05-02 10:24:41 +02:00
Thomas Schatzl
72977f4009 8155230: Tune thread usage for mark bitmap clear 
Reviewed-by: jmasa, mgerdin
 2016-05-02 10:24:41 +02:00
Thomas Schatzl
bd8bbf9e27 8153507: Improve Card Table Clear Task 
Move card table clear code into remembered set related files. Improve work distribution of this task, and tune thread usage.

Reviewed-by: jmasa, mgerdin
 2016-05-02 10:24:41 +02:00
Thomas Schatzl
238fada762 8155232: Augment Workgang to run task with a given number of threads 
Add a method to run a WorkGang with a set number of threads.

Reviewed-by: stefank, jmasa, mgerdin
 2016-05-02 10:24:41 +02:00
Dmitry Samersoff
85deb5aa7e 8154258: [TESTBUG] Various serviceability tests fail compilation 
Replace sun.misc.Unsafe with jdk.internal.misc.Unsafe

Reviewed-by: chegar, kvn
 2016-05-01 12:47:00 +03:00
Max Ockner
da0fe9d476 8154110: Update class* and safepoint* logging subsystems 
Refactored logging tags in class and safepoint subsystems.

Reviewed-by: coleenp, rehn, hseigel
 2016-04-29 22:40:51 -04:00
Jon Masamitsu
c011c03c17 Merge 2016-04-29 18:55:41 +00:00
Eric Caspole
9feeaa65eb Merge 2016-04-29 18:00:57 +02:00
Eric Caspole
dec22baf4d 8155685: Wrong indentation in ClassFileParser::post_process_parsed_stream 
Fix indentation

Reviewed-by: dcubed
 2016-04-29 10:04:24 -04:00
Vladimir Ivanov
84d06ff2d0 Merge 2016-04-29 14:17:34 +03:00
Stefan Johansson
4956880699 8155245: Add logging when MMU target is violated 
Reviewed-by: ehelin, mgerdin
 2016-04-29 08:39:22 +02:00
Alejandro Murillo
59e339e6ec Merge 2016-04-28 23:08:16 -07:00
Marcus Larsson
813dd79774 Merge 2016-04-29 04:44:08 +02:00
Pavel Punegov
d417d4012a Merge 2016-04-29 03:02:43 +02:00
Gerard Ziemski
68e83181df Merge 2016-04-28 23:32:50 +00:00
Vladimir Ivanov
72747f47fd Merge 2016-04-29 02:13:40 +03:00
Gerard Ziemski
6622c7a0d8 Merge 2016-04-28 22:44:52 +00:00
Serguei Spitsyn
cd0e40814f Merge 2016-04-28 21:56:38 +00:00
Alejandro Murillo
59292b53e3 Merge 2016-04-28 14:44:52 -07:00
Stefan Karlsson
06ae3a970a Merge 2016-04-28 22:32:06 +02:00
Serguei Spitsyn
cfe7bd538a Merge 2016-04-28 19:34:13 +00:00
Serguei Spitsyn
0c5f058520 8153190: JVMTI GetAllModules should make it clear that it also returns unnamed module 
Clarify the JVMTI spec

Reviewed-by: alanb
 2016-04-28 12:25:16 -07:00
Harold Seigel
d30adc68f2 8151342: Add module name/version to class histogram output 
Add additional column to histogram containing module@version

Reviewed-by: sundar, gtriantafill
 2016-04-28 13:44:36 -04:00
Gerard Ziemski
41a3e98a61 8153835: Fix range of flag MaxDirectMemorySize which is parsed at jlong 
Changed MaxDirectMemorySize type to uint64_t and set max to max_jlong

Reviewed-by: goetz, simonis
 2016-04-28 10:41:53 -05:00
Kirill Zhaldybin
d423c99efc 8155527: New test TestHumongousClassLoader fails with "-XX:+ExplicitGCInvokesConcurrent" option 
Reviewed-by: dfazunen, drwhite, jwilhelm
 2016-04-28 16:55:04 +03:00
Pavel Punegov
9c04e65bda 8155034: [TESTBUG] ctw tests fail to compile: module reads package sun.reflect from both jdk.unsupported and java.base 
Replace sun.reflect with jdk.internal.reflect

Reviewed-by: iignatyev, ddmitriev
 2016-04-28 17:58:18 +03:00
Stefan Karlsson
c12b6076dc 8155206: Internal VM test DirectiveParser_test is too verbose 
Reviewed-by: rehn, neliasso
 2016-04-28 15:52:08 +02:00
Serguei Spitsyn
7d20b786fd Merge 2016-04-28 09:10:10 +00:00
Serguei Spitsyn
367a7bd592 8153749: New capability can_generate_early_class_hook_events 
Add new capability

Reviewed-by: alanb, dsamersoff
 2016-04-28 00:36:46 -07:00
Calvin Cheung
023aa74fc2 8154976: UseSharedSpaces error message is incomplete 
Reviewed-by: cjplummer, jiangli, mseledtsov
 2016-04-27 11:40:43 -07:00
Mikael Gerdin
8f81f1a52b 8150393: Maintain the set of survivor regions in an array between GCs 
Reviewed-by: tschatzl, sjohanss
 2016-04-27 16:11:45 +02:00
Stefan Johansson
97a96449f9 8155087: Calculation in other_time_ms() is incorrect 
Reviewed-by: tschatzl, ehelin
 2016-04-27 16:02:32 +02:00
Stefan Johansson
b2c560bc98 8155082: Refactor mutator region restriction 
Reviewed-by: mgerdin, tschatzl
 2016-04-27 16:02:02 +02:00
Yasumasa Suenaga
10ed386bc7 8155089: UL: Remove trailing comma from log decoration list 
Reviewed-by: dsamersoff, mlarsson
 2016-04-27 21:00:45 +09:00
Mikael Gerdin
61541740ca 8155209: Move setting of young index in cset to G1CollectionSet 
Reviewed-by: sjohanss, ehelin
 2016-04-27 11:25:16 +02:00
Shafi Ahmad
5c6e28cc60 8147026: Convert an assert in ClassLoaderData to a guarantee 
Guarantee is to ensure classloader is a valid oop will help catch the errors at an early stage rather than crashing the JVM later on in the GC

Reviewed-by: coleenp
 2016-04-26 23:29:51 +05:30
Jon Masamitsu
cf2c110c5e 8154743: Internal Error: psParallelCompact.hpp assert(addr >= _region_start) failed: bad addr 
Reviewed-by: tschatzl, kbarrett
 2016-04-26 09:19:19 -07:00
David Simms
64ca7559f5 8149442: MonitorInUseLists should be on by default, deflate idle monitors taking too long 
MonitorInUseLists on by default

Reviewed-by: rbackman, mlarsson
 2016-04-26 12:46:40 +02:00
Stefan Karlsson
08e7841365 8141496: BitMap set operations copy their other BitMap argument 
Reviewed-by: mgerdin, tschatzl
 2016-04-27 08:48:39 +02:00
Pavel Punegov
f3ac4f761e Merge 2016-04-26 20:55:39 +02:00
Pavel Punegov
a1e8e87784 Merge 2016-04-26 18:54:37 +02:00
Erik Joelsson
48052922da Merge 2016-04-26 17:46:36 +02:00
Rachel Protacio
0bfa2e4a14 Merge 2016-04-26 15:45:20 +00:00
Andrew Haley
afcf41b8d4 8155100: AArch64: Relax alignment requirement for byte_map_base 
Reviewed-by: roland
 2016-04-26 14:38:39 +00:00
Rachel Protacio
e0ed19b78a Merge 2016-04-26 14:22:06 +00:00
Kirill Zhaldybin
75d8a4b585 8155092: [TESTBUG] TestHumongousClassLoader.java needs UnlockDiagnosticVMOptions before WhiteBoxAPI 
Reviewed-by: tschatzl, dfazunen
 2016-04-26 16:50:34 +03:00
Marcus Larsson
5884a7924e Merge 2016-04-26 15:16:41 +02:00
Rachel Protacio
09add35155 8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass 
Converted package() and module() functions to pure virtual functions of Klass

Reviewed-by: dholmes, coleenp, lfoltan, hseigel
 2016-04-26 09:08:12 -04:00
Dmitry Dmitriev
b788b49698 Merge 2016-04-26 11:49:37 +00:00
Dmitry Fazunenko
ec1e617810 Merge 2016-04-26 11:46:38 +00:00
Erik Joelsson
e28d7b714e 8150601: Remove the old Hotspot build system 
Reviewed-by: ihse
 2016-04-26 13:35:28 +02:00
Alexander Kulyakhtin
7cf6a15162 8153992: Some hotspot tests fail on compact2 due to an unnecessary test library dependency 
Removing unnecessary dependency on java.management from the ProcessTool.getProcessId()

Reviewed-by: mchung
 2016-04-26 13:22:32 +03:00
Dmitry Fazunenko
2a16196f05 Merge 2016-04-26 10:01:00 +00:00
Dmitry Fazunenko
5071cda359 Merge 2016-04-26 09:14:06 +00:00
Goetz Lindenmaier
1601aea438 8155085: [ppc] Fix Type-O in "8154580: Save mirror in interpreter frame..." 
Reviewed-by: dholmes, mgerdin
 2016-04-26 11:05:11 +02:00
Robbin Ehn
d58feb9912 8154719: JvmtiBreakpoint rename method print() to print_on() 
Reviewed-by: mlarsson, sla, sspitsyn
 2016-04-26 10:58:03 +02:00
Antonios Printezis
76adc93577 8151556: Use the PreservedMarks* classes for the G1 preserved mark stacks 
Reviewed-by: tschatzl
 2016-04-26 10:23:08 +02:00
Antonios Printezis
41a5d2d430 8154153: PS: Restore preserved marks in parallel 
Restore preserved marks after evacuation failure in parallel using the PreservedMark infrastructure.

Reviewed-by: tschatzl
 2016-04-26 10:19:57 +02:00
Alejandro Murillo
dbf7eb0492 Merge 2016-04-25 14:15:38 -07:00
Chris Plummer
5619a7209c 8154379: MIN_STACK_SHADOW_PAGES should equal DEFAULT_STACK_SHADOW_PAGES on aarch64 
Undid previous change that had set it to 1.

Reviewed-by: enevill, adinn, aph
 2016-04-25 12:11:58 -07:00
Roland Westrelin
15893e995b 8155015: Aarch64: bad assert in spill generation code 
Reviewed-by: thartmann
 2016-04-25 15:14:02 +02:00
Roland Westrelin
23ce249250 8154939: 8153998 broke vectorization on aarch64 
Reviewed-by: kvn, mcberg
 2016-04-27 01:14:07 -07:00
Jan Civlin
f2e9b827d6 8154495: SHA256 AVX2 intrinsic (when no supports_sha() available) 
Reviewed-by: kvn
 2016-04-26 21:54:21 -07:00
Michael Berg
7c4302f618 8154896: xml.transform fails intermittently on SKX 
Replace some short branches (jccb) to avoid problem when EVEX is used.

Reviewed-by: twisti, kvn
 2016-04-26 20:43:59 -07:00
Rickard Bäckman
b853eb7f5c 8151956: Support non-continuous CodeBlobs in HotSpot 
Reviewed-by: iveresov, thartmann, simonis
 2016-04-26 10:28:51 +02:00
Vladimir Ivanov
67ff4391ec 8154172: C1: NPE is thrown instead of linkage error when invoking nonexistent method 
Reviewed-by: kvn
 2016-04-25 21:25:22 +03:00
Vladimir Ivanov
e17b342749 8134918: C2: Type speculation produces mismatched unsafe accesses 
Reviewed-by: kvn
 2016-04-25 18:36:27 +03:00
Jim Laskey
ce076f3ab9 8147634: Need a JImage API that given a JImageLocationRef returns class name 
Reviewed-by: hseigel
 2016-04-25 09:59:43 -03:00
Jim Laskey
c95df8b9fe 8147426: Missing definition for JIMAGE_NOT_FOUND 
Reviewed-by: hseigel, alanb
 2016-04-25 09:59:07 -03:00
Goetz Lindenmaier
187fe4afd1 8154996: [aix] Implement compare_file_modified_times for "8146879: Add option ..." 
Reviewed-by: simonis
 2016-04-25 12:42:29 +02:00
Erik Helin
bbe16a058e Merge 2016-04-25 17:24:33 +02:00
Coleen Phillimore
ec68fa3411 Merge 2016-04-25 15:22:16 +00:00
Andrew Haley
874b51e362 Merge 2016-04-25 15:02:33 +00:00
Andrew Haley
f2ba1fde33 8154957: AArch64: Better byte behavior 
The fix for 8132051 is needed for AArch64.

Reviewed-by: roland
 2016-04-25 14:22:36 +00:00
Coleen Phillimore
de88e58a82 8154580: Save mirror in interpreter frame to enable cleanups of CLDClosure 
GC walks the mirror using OopClosure rather than using CLDClosure in oops_interpreted_do()

Reviewed-by: dlong, twisti, stefank
 2016-04-25 09:51:00 -04:00
Stefan Karlsson
9ca6318ece 8017629: G1: UseSHM in combination with a G1HeapRegionSize > os::large_page_size() falls back to use small pages 
Reviewed-by: pliden, sjohanss, stuefe
 2016-04-25 11:36:14 +02:00
Tobias Hartmann
3a358f4cff 8086057: Crash with "modified node is not on IGVN._worklist" when running with -XX:-SplitIfBlocks 
Pre-loop Opaque1 node 'pre_opaq' should be put on the IGVN worklist after modification.

Reviewed-by: kvn
 2016-04-25 10:53:42 +02:00
Tobias Hartmann
ebc384160f 8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled 
Disable multiversioning if range check elimination is turned off.

Reviewed-by: mcberg, kvn
 2016-04-25 10:51:44 +02:00
Jiangli Zhou
04ec692aca Merge 2016-04-22 19:40:39 +02:00
Coleen Phillimore
bc5d385d04 Merge 2016-04-22 16:17:45 +00:00
Matthias Baesken
d88ba0b30d 8154566: os_linux.cpp parse_os_info gives non descriptive output on current SLES releases 
For SuSE, read the first line of the /etc/xrelease file, also get PRETTY_NAME from /etc/os_release

Reviewed-by: gthornbr, coleenp
 2016-04-23 15:21:48 -04:00
Michail Chernov
0fc708181a 8154341: [TESTBUG] G1 stress test for humongous objects allocation 
Reviewed-by: jwilhelm, dfazunen
 2016-04-22 18:19:29 +03:00
Michail Chernov
4397d91642 8154759: [TESTBUG] GC tests should be changed to be able to execute with -Xlog:all=trace 
Reviewed-by: jmasa, dfazunen
 2016-04-22 17:49:15 +03:00
Coleen Phillimore
77eae51159 Merge 2016-04-22 14:48:35 +00:00
Michail Chernov
14a8adfd9f 8154843: GC tests should be correctly marked with @module 
Reviewed-by: jwilhelm, dfazunen
 2016-04-22 17:46:06 +03:00
Nils Eliasson
24d3db305c 8153527: break_tty_lock_for_safepoint causes "assert(false) failed: bad tag in log" and broken compile log 
Retake tty_lock before printing closing tag in print_optoassembly

Reviewed-by: kvn
 2016-04-22 16:05:00 +02:00
Coleen Phillimore
5f5a877bf4 Merge 2016-04-22 13:16:57 +00:00
Goetz Lindenmaier
dafa24689b 8154921: Fix aix after "8146879: Add option for handling existing log files in UL" 
Rename os::fileno to os::get_fileno because AIX defines macro 'fileno'.

Reviewed-by: coleenp
 2016-04-22 14:57:18 +02:00
Andrew Haley
651e264d3c 8154210: Zero: Better byte behaviour 
Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems

Reviewed-by: andrew, chrisphi, coleenp
 2016-04-22 14:30:58 +02:00
Thomas Schatzl
2e4cd63893 Merge 2016-04-22 13:43:36 +02:00
Martin Doerr
2ee49b78fe 8154867: PPC64: Better byte behavior 
Reviewed-by: goetz
 2016-04-22 10:46:08 +02:00
Thomas Schatzl
78d48b8bee 8154838: G1CardLiveData::free_large_bitmap() uses wrong calculation to determine the number of words 
Use the exact same calculation as G1CardLiveData::allocate_large_bitmap() in free_large_bitmap().

Reviewed-by: stefank, jmasa
 2016-04-22 10:19:22 +02:00
Alejandro Murillo
f9426642c6 Merge 2016-04-22 01:04:00 -07:00
Alejandro Murillo
638bcd60aa Merge 2016-04-22 00:08:54 -07:00
Chris Plummer
7cd3700010 8148195: Some InstanceKlass and MethodCounters fields can be excluded when JVMTI is not supported 
Removed "previous version", "cached class file",  and breakpoint related fields and code when JVMTI is not supported

Reviewed-by: coleenp, sspitsyn
 2016-04-21 20:49:11 -07:00
Erik Gahlin
391c11f0c2 8154794: Add support for experimental fields/events to event-based tracing 
Reviewed-by: mlarsson, mgronlun
 2016-04-22 00:08:43 +02:00
Lana Steuck
4849577827 Merge 2016-04-21 13:36:14 -07:00
Bharadwaj Yadavalli
d1b219ba3c Merge 2016-04-21 20:11:40 +00:00
Bharadwaj Yadavalli
80a156e005 Merge 2016-04-21 15:59:07 -04:00
Lana Steuck
4fff4771e0 Added tag jdk-9+115 for changeset a936b4e01afb 2016-04-21 12:57:06 -07:00
Kirill Zhaldybin
b15c8503ab 8132718: Add tests which check that when humongous classloader object becomes unreachable it and all classes that were loaded in it should be collected 
Reviewed-by: jmasa, dfazunen
 2016-04-21 17:55:14 +03:00
Kirill Zhaldybin
769aba784a 8153764: Add auxiliary method that generates class by class prototype to gc testlibrary 
Reviewed-by: dfazunen, iignatyev
 2016-04-21 18:01:10 +03:00
Per Liden
48892f6f68 8152949: Jigsaw crash when Klass in _fixup_module_field_list is unloaded 
During start up anonymous classes must be kept alive until after their mirror's module field is patched with java.base

Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Reviewed-by: coleenp, hseigel
 2016-04-21 09:23:04 -04:00
Tobias Hartmann
ecea45ddad Merge 2016-04-21 09:29:54 +00:00
Tobias Hartmann
257c8ccafc 8086068: VM crashes with "-Xint -XX:+UseCompiler" options 
Prevent incompatible compiler flag combination.

Reviewed-by: zmajo, kvn, ddmitriev
 2016-04-21 10:52:00 +02:00
Zoltan Majo
1af5fe07a0 8153292: AllocateInstancePrefetchLines>AllocatePrefetchLines can trigger out-of-heap prefetching 
Set the size of the reserved TLAB area to the MAX of both flags.

Reviewed-by: kvn, thartmann
 2016-04-21 09:21:48 +02:00
Vladimir Ivanov
04dd07454a 8154145: Missing klass/method name in stack traces on error 
Reviewed-by: stefank, cjplummer
 2016-04-20 20:40:46 +03:00
Erik Helin
63484cce64 8154753: Turn G1Policy into an interface 
Reviewed-by: sjohanss, mgerdin
 2016-04-20 15:24:18 +02:00
Roland Westrelin
794bbd1a36 8154537: AArch64: some integer rotate instructions are never emitted 
Reviewed-by: aph, adinn, kvn
 2016-04-19 19:52:39 -07:00
Mikhailo Seledtsov
c791bde668 8153549: [TESTBUG] remove obsolete runtime/SharedArchiveFile/BasicJarBuilder 
Removed the obsolete file, after ensuring no other jdk components depend on it

Reviewed-by: iklam, lfoltan, hseigel, gtriantafill, ctornqvi
 2016-04-19 15:11:23 -07:00
Bharadwaj Yadavalli
d61df5babe Merge 2016-04-19 15:26:59 -04:00
Mikael Gerdin
4adb7c0788 8154752: Cleanup initialization of G1Policy 
Reviewed-by: ehelin, tschatzl
 2016-04-19 14:53:33 +02:00
Mikael Gerdin
91b2afa99d 8154745: Move default G1 pause time target setup to argument parsing 
Reviewed-by: ehelin, sjohanss
 2016-04-19 14:53:32 +02:00
Mikael Gerdin
7587fbdd30 8154452: Deferred cleanups after split of G1CollectorPolicy code 
Reviewed-by: ehelin, sjohanss
 2016-04-21 10:19:00 +02:00
Mikael Gerdin
39b43a87e7 8154467: Cleanup initialization of GCPolicyCounters 
Reviewed-by: ehelin, sjohanss
 2016-04-21 10:18:50 +02:00
Stefan Karlsson
fdd7fde740 8053885: test/runtime/memory/RunUnitTestsConcurrently.java fails on solaris with largepage options 
Reviewed-by: jmasa, pliden
 2016-04-21 09:08:33 +02:00
Jiangli Zhou
2d65e6174c 8154457: runtime/SharedArchiveFile/SharedStrings Shared string table stats missing 
Added more information when print out message reporting disabling the shared strings at CDS dump time.

Reviewed-by: lfoltan, hseigel, mseledtsov, gtriantafill
 2016-04-20 16:04:38 -04:00
Kirill Zhaldybin
4ba6969ac6 8135200: Add White Box method that enumerates G1 old regions with less than specified liveness and collects statistics 
Reviewed-by: tschatzl, dfazunen, iignatyev
 2016-04-20 19:54:51 +03:00
Kirill Zhaldybin
c66b2de971 8138607: gc/g1/mixedgc/TestLogging.java - G1 Evacuation Pause missing from output 
Reviewed-by: tschatzl, dfazunen
 2016-04-19 19:13:18 +03:00
Andrew Haley
2b0d77befa 8154739: AArch64: TemplateTable::fast_xaccess loads in wrong mode 
Reviewed-by: roland
 2016-04-20 11:14:10 +00:00
Andrew Haley
1832f0f0f1 Merge 2016-04-20 11:11:56 +00:00
Andrew Haley
cdcd378bd6 8153310: AArch64: JEP 254: Implement byte_array_inflate 
Reviewed-by: roland
 2016-04-20 11:05:28 +00:00
Robbin Ehn
e61f2f7f5e 8154728: JvmtiExport::add_default_read_edges hits a guarantee 
Reviewed-by: mgerdin, dholmes, stefank
 2016-04-20 10:01:25 +02:00
Stefan Karlsson
790431bd5d 8079843: do_young_space_rescan - comment out of sync with code 
Reviewed-by: mgerdin, sjohanss, ehelin, tschatzl
 2016-04-20 09:58:15 +02:00
Coleen Phillimore
277996e430 Merge 2016-04-20 05:27:06 +00:00
Coleen Phillimore
97a7246217 Merge 2016-04-20 03:12:01 +00:00
Coleen Phillimore
2aff402303 8154280: Zero build fails with undeclared G1LastPLABAverageOccupancy 
Reviewed-by: twisti
 2016-04-21 02:58:04 -04:00
Max Ockner
16c430d2b6 8151526: Print -Xlog configuration in the hs_err_pid file 
Logging configuration is now printed in hs_err and in vm info.

Reviewed-by: coleenp, mlarsson, dholmes
 2016-04-19 11:03:37 -04:00
Robbin Ehn
167be2a61c 8154059: JVMTI ObjectTagging to UL 
Reviewed-by: sspitsyn, mlarsson
 2016-04-19 14:21:26 +02:00
Robbin Ehn
9d7444952a 8154041: JVMTI trace to Unified Logging 
Reviewed-by: sspitsyn, mlarsson
 2016-04-19 14:14:04 +02:00
Marcus Larsson
1ea0fb7b87 Merge 2016-04-19 12:30:00 +02:00
Chris Hegarty
d6c8ba8845 8153756: jdk.vm.ci should not depend on sun.misc ( jdk.unsupported module ) 
Reviewed-by: twisti
 2016-04-19 09:31:53 +01:00
Robbin Ehn
4b7eacd933 8154235: Using deprecated flags converted to UL shows wrong hint 
Reviewed-by: rprotacio, mockner, coleenp
 2016-04-19 09:48:43 +02:00
Mikael Gerdin
bda93dad55 Merge 2016-04-19 09:06:38 +02:00
Stefan Karlsson
66777c3399 8067785: Using AlwaysPreTouch does not always touch all pages 
Reviewed-by: pliden, drwhite
 2016-04-19 08:12:28 +02:00
Michael Berg
64cf7e6b6f 8153998: Masked vector post loops 
Masked vectorization for post loops to execute in a single iteration in place of fixup scalar loops which used to take many iterations to complete work for user loops.

Reviewed-by: twisti, kvn
 2016-04-18 15:18:14 -07:00
Tatiana Pivovarova
332ffb710a Merge 2016-04-18 20:57:16 +00:00
Kim Barrett
7ced38a6b5 Merge 2016-04-18 22:40:47 +02:00
Kim Barrett
3079c942b6 8133051: Concurrent refinement threads may be activated and deactivated at random 
Establish min threshold step; earlier primary refinement thread activation.

Reviewed-by: tschatzl, drwhite, mgerdin, jmasa
 2016-04-18 14:52:31 -04:00
Roland Westrelin
e08e2ac711 8154135: Loop alignment may be added inside the loop body 
Reviewed-by: kvn, vlivanov
 2016-04-18 20:57:27 +03:00
Harold Seigel
33aa33f03a 8154268: [TESTBUG] Compilation of ExportAllUnnamed.java failed, missing @modules 
Add missing @modules and @build tags

Reviewed-by: ctornqvi, lfoltan, gtriantafill
 2016-04-18 13:42:52 -04:00
Andrew Haley
66208f1fca 8152554: CompactStrings broken on AArch64 
Correct the logic for string intrinsics.

Reviewed-by: roland
 2016-04-18 15:37:29 +00:00
Thomas Schatzl
4c2f0704f3 8153170: Card Live Data does not correctly handle eager reclaim 
The card live data of regions eagerly reclaimed during remark and cleanup pause could be wrong, not considering that these regions were eagerly reclaimed and empty.

Reviewed-by: drwhite, kbarrett
 2016-04-18 16:54:04 +02:00
Thomas Schatzl
d55089d82b 8153503: Move remset scan iteration claim to remset local data structure 
Reviewed-by: drwhite, mgerdin
 2016-04-18 16:51:14 +02:00
Anton Ivanov
6c95220480 8154174: Improve JitTester performance 
Reviewed-by: iignatyev
 2016-04-18 15:40:11 +03:00
Severin Gehwolf
79859bc5dd 8153275: Zero JVM fails to initialize after JDK-8152440 
Use a value for InitArrayShortSize which passes validation

Reviewed-by: aph, andrew, coleenp
 2016-04-18 11:30:12 +02:00
Zoltan Majo
c05dd2fdca 8153357: C2 creates incorrect cast after eliminating phi with unique input 
Refine C2's logic to determine the type of cast node added.

Reviewed-by: kvn
 2016-04-18 11:22:51 +02:00
Zoltan Majo
acab1fddac 8072428: Enable UseLoopCounter ergonomically if on-stack-replacement is enabled 
Set UseLoopCounter ergonomically if on-stack-replacement is enabled. Print warning.

Reviewed-by: kvn
 2016-04-18 09:39:55 +02:00
Ioi Lam
6526d15d6e 8150607: Clean up CompactHashtable 
Refactored code, and added test cases for serviceability agent

Reviewed-by: jiangli, ccheung
 2016-04-17 19:15:52 -07:00
Chris Hegarty
00f6a09302 8137058: Clear out all non-Critical APIs from sun.reflect 
Reviewed-by: alanb, jfranck, mchung
 2016-04-15 16:19:15 +01:00
Jesper Wilhelmsson
633da50166 Merge 2016-04-15 17:17:58 +02:00
Daniel D. Daugherty
2e49c43a00 Merge 2016-04-14 20:43:16 -07:00
Alejandro Murillo
b3349ef0ea Merge 2016-04-14 19:55:39 -07:00
Daniel D. Daugherty
f6e4fcc556 Merge 2016-04-14 17:42:29 -07:00
Lana Steuck
76e228d3db Merge 2016-04-14 09:33:16 -07:00
Lana Steuck
31f8c74497 Added tag jdk-9+114 for changeset 03e2f4d0a421 2016-04-14 09:09:23 -07:00
Rachel Protacio
35554a995f Merge 2016-04-14 15:38:04 +00:00
Marcus Larsson
49b5714e90 Merge 2016-04-14 16:43:09 +02:00
Rachel Protacio
e3de4dada7 Merge 2016-04-14 14:14:28 +00:00
Dmitry Fazunenko
734903c517 Merge 2016-04-14 14:13:07 +00:00
Rachel Protacio
aa0d0aa80d Merge 2016-04-14 14:05:09 +00:00
Rachel Protacio
acd52761a2 8152845: Improve PackageEntry and ModuleEntry print methods for future logging 
Changed print methods for PackageEntry and ModuleEntry to take an outputStream

Reviewed-by: lfoltan, hseigel, coleenp
 2016-04-14 09:46:03 -04:00
Erik Joelsson
2710266ac2 8149777: Enable enhanced failure handler for "make test" 
Reviewed-by: ihse
 2016-04-14 15:13:42 +02:00
Marcus Larsson
7ef647996f Merge 2016-04-14 15:10:50 +02:00
Michail Chernov
8c6cc265f6 8153222: [TESTBUG] Move tests in stress/gc to gc/stress 
Reviewed-by: dfazunen, jwilhelm
 2016-04-14 15:45:38 +03:00
Bengt Rutisson
dc9715ebf1 Merge 2016-04-14 13:31:11 +02:00
Robbin Ehn
e13ecd97b0 8154064: JVMTI trace event crashes 
Reviewed-by: sla, stefank
 2016-04-14 11:55:28 +02:00
Bengt Rutisson
3bb96580fb 8073321: assert(q > prev_q) failed: we should be moving forward through memory 
Reviewed-by: jmasa, mgerdin
 2016-04-14 11:17:34 +02:00
Thomas Schatzl
2d6f4ee98f 8154141: [TESTBUG] test/gc/g1/TestRegionLivenessPrint.java misses -XX:+UnlockDiagnosticVMOption flag 
Reviewed-by: dfazunen, jwilhelm
 2016-04-14 10:57:09 +02:00
Stefan Johansson
e79c2a2d8b 8153745: Avoid spawning G1ParPreserveCMReferentsTask when there is no work to be done 
Reviewed-by: brutisso, jmasa, tschatzl
 2016-04-14 08:30:37 +02:00
Stefan Johansson
a9e64aa572 8154051: Change G1YoungGenSizer to use UL log_warning instead of warning 
Reviewed-by: brutisso, mgerdin
 2016-04-14 08:30:15 +02:00
Gerard Ziemski
8e65d33717 Merge 2016-04-14 03:57:13 +00:00
Coleen Phillimore
50a5ba9849 Merge 2016-04-13 23:31:40 +00:00
Derek White
1326ae31c8 8152905: hs_err file is missing gc threads 
List the GC threads in the hs_err file in the "Other Threads" section

Reviewed-by: dcubed, coleenp
 2016-04-13 17:00:54 -04:00
Gerard Ziemski
f474e970ba 8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT 
Added mtArguments and replaced argument related usages of mtInternal with the new flag.

Reviewed-by: coleenp, gtriantafill
 2016-04-13 15:53:46 -05:00
Coleen Phillimore
8e63a10779 8148772: VM crash in nsk/jvmti/RedefineClasses/StressRedefine: assert failed: Corrupted constant pool 
8151546: nsk/jvmti/RedefineClasses/StressRedefine fails in hs nightly

ConstantPool::resolve_constant_at_impl() isn't thread safe for MethodHandleInError and MethodTypeInError and Constant pool merging is not thread safe for source_file_name.

Reviewed-by: sspitsyn, dcubed
 2016-04-13 12:57:31 -04:00
Dmitry Fazunenko
23da19a790 8153755: Improve test: stress/gc/TestStressRSetCoarsening.java 
Reviewed-by: tschatzl, kzhaldyb
 2016-04-13 19:55:40 +04:00
Nils Eliasson
90d0e9a566 8153013: BlockingCompilation test times out 
Task has no invocation count and get stale at once

Reviewed-by: kvn, iveresov, twisti
 2016-04-13 14:48:22 +02:00
Nils Eliasson
c8593eff81 8154151: VM crashes with assert "Ensure we don't compile before compilebroker init" 
Drop compiles submitted with complevel_none

Reviewed-by: kvn
 2016-04-18 11:30:10 +02:00
Mikael Gerdin
b5a7ed16dd Merge 2016-04-13 13:53:05 +02:00
Erik Joelsson
9166e5a215 Merge 2016-04-13 12:11:06 +02:00
Volker Simonis
7e7ae63929 8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build 
Reviewed-by: erikj, goetz
 2016-04-13 11:13:14 +02:00
Derek White
8423e2c392 8149405: OOM Error running java/lang/invoke/MethodHandlesTest.java on windows-x86 
Add missing ResourceMarks to release memory more quickly.

Reviewed-by: jmasa, kbarrett
 2016-04-12 14:46:02 -04:00
Mikael Gerdin
89282b0c72 8153834: G1 Card table verification fails due to concurrent region cleanup 
Reviewed-by: ehelin, tschatzl
 2016-04-12 14:03:31 +02:00
Stefan Karlsson
e0d0903059 Merge 2016-04-12 09:08:48 +00:00
Stefan Karlsson
f78228b2ee 8153967: Remove top.hpp 
Reviewed-by: coleenp, jwilhelm
 2016-04-12 09:53:43 +02:00
Stefan Karlsson
cf254af2fb 8152491: Convert TracePageSizes to use UL 
Reviewed-by: sjohanss, pliden
 2016-04-12 07:17:44 +02:00
Alejandro Murillo
7ab9e3f794 8154028: Several hotspot tests need to be updated after 8153737 (Unsupported Module) 
Reviewed-by: darcy, kvn
 2016-04-11 20:38:38 -07:00
Alejandro Murillo
45b6e4a1ca Merge 2016-04-11 14:21:25 -07:00
Marcus Larsson
8b2f63bd2b 8146879: Add option for handling existing log files in UL 
Reviewed-by: dsamersoff, gziemski, rehn
 2016-04-11 12:22:09 +02:00
Mikael Gerdin
19cd9b20e8 8153843: G1CardLiveDataHelper incorrectly sets next_live_bytes on dead humongous regions 
Reviewed-by: drwhite, tschatzl
 2016-04-11 09:49:10 +02:00
Robbin Ehn
1afb9e9427 8153845: UL log write method missing essential assert 
Reviewed-by: mlarsson, brutisso
 2016-04-11 09:45:03 +02:00
Stefan Karlsson
3200059098 8153659: Create a CHeap backed LogStream class 
Reviewed-by: brutisso, mlarsson
 2016-04-11 08:51:53 +02:00
Stefan Karlsson
dab21ebd4d 8153658: Redundant memory copy in LogStreamNoResourceMark 
Reviewed-by: kbarrett, jmasa
 2016-04-11 08:51:53 +02:00
Stefan Karlsson
0f89b2e137 8153583: Make OutputAnalyzer.reportDiagnosticSummary public 
Reviewed-by: brutisso, sjohanss
 2016-04-11 08:51:53 +02:00
Stefan Karlsson
388236cc3d 8152962: CMSCollector::shouldConcurrentCollect incorrectly logs against the debug stream 
Reviewed-by: brutisso, sjohanss
 2016-04-11 08:51:53 +02:00
Stefan Karlsson
2ca745d47a 8152639: ResourceMark missing in reportFreeListStatistics 
Reviewed-by: pliden, sjohanss
 2016-04-11 08:51:53 +02:00
Stefan Karlsson
71bcff35cf 8153742: Move Thread::current() to thread.hpp 
Reviewed-by: coleenp, jmasa
 2016-04-11 08:51:53 +02:00
Max Ockner
ae7543e824 Merge 2016-04-12 02:30:13 +02:00
Max Ockner
da8b3bf9a7 Merge 2016-04-12 00:24:39 +02:00
Jesper Wilhelmsson
545a5175ca Merge 2016-04-11 20:38:50 +00:00
Max Ockner
46e3ccd80c Merge 2016-04-11 22:14:14 +02:00
Max Ockner
cf540ad2af 8145704: Make test for classinit logging more robust 
8145704: Make test for classinit logging more robust.

Reviewed-by: hseigel, gtriantafill
 2016-04-11 16:10:41 -04:00
Jesper Wilhelmsson
2497c61bc6 Merge 2016-04-11 20:16:35 +02:00
Max Ockner
ac0824cbad 8152468: PrintMiscellaneous in constantPool should use classresolve logging 
Some instances of PrintMiscellaneous have ben replaced by classresolve logging.

Reviewed-by: coleenp, rprotacio
 2016-04-11 11:33:52 -04:00
Dmitry Samersoff
a9a7c55767 Merge 2016-04-11 14:42:56 +00:00
Cheleswer Sahu
3a4f4362a6 8153319: new test serviceability/tmtools/jstack/JstackThreadTest.java fails 
Reviewed-by: dsamersoff, lmesnik
 2016-04-11 12:50:08 +00:00
Dmitry Samersoff
9aad06b66d Merge 2016-04-11 10:06:19 +00:00
Dmitry Samersoff
18ee0a135b Merge 2016-04-11 09:39:49 +00:00
David Holmes
7b27547030 8151322: Implement os::set_native_thread_name() on Solaris 
Reviewed-by: sla, kbarrett, gziemski
 2016-04-10 21:34:47 -04:00
Chris Hegarty
b7075c2db9 8153737: Unsupported Module 
Reviewed-by: alanb, mchung, psandoz
 2016-04-09 23:03:39 +01:00
Chris Hegarty
39e36bdf78 8153498: Update the PostVMInitHook mechanism to use an internal package in the base module 
Reviewed-by: alanb, lfoltan
 2016-04-09 23:03:25 +01:00
Coleen Phillimore
6cec4d5047 Merge 2016-04-09 08:34:51 -04:00
Dmitry Samersoff
78a7d2c169 8152679: DeadlockDetectionTest.java fails due to expected output missing 
Detect OS X and bailout

Reviewed-by: sspitsyn, tbell
 2016-04-09 12:15:13 +03:00
Coleen Phillimore
e9a1251fb3 8033735: make Throwable.backtrace visible to Class.getDeclaredField again 
Removed old hack to workaround an old crash.

Reviewed-by: hseigel, twisti, mchung
 2016-04-08 19:39:32 -04:00
Bharadwaj Yadavalli
cecf2d83d5 Merge 2016-04-08 12:36:27 -04:00
Robbin Ehn
e1a8c2d197 8153731: Increase max tag combinations for UL expression (config) 
Reviewed-by: stefank, mlarsson
 2016-04-08 15:36:34 +02:00
Erik Joelsson
87d68625af 8152666: The new Hotspot Build System 
Co-authored-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
Co-authored-by: Ingemar Aberg <ingemar.aberg@oracle.com>
Reviewed-by: ihse, dcubed, erikj
 2016-04-08 13:14:23 +02:00
Frederic Parain
20330031f4 Merge 2016-04-08 10:39:53 +02:00
Frederic Parain
890207217f 8146093: [sparc only] compiler/interpreter/7116216/StackOverflow.java Program terminates with signal 11, Segmentation fault. in __1cLRegisterMap2t6MpnKJavaThread_b_v_ () 
Reviewed-by: dcubed, coleenp
 2016-04-08 00:38:00 -07:00
Per Lidén
67ed025379 8152989: serviceability/tmtools/jstat/GcCauseTest02.java fails with OOME 
Reviewed-by: dsamersoff, sjohanss, dfazunen
 2016-04-08 08:51:45 +02:00
Calvin Cheung
28edd79d64 8145221: Use trampolines for i2i and i2c entries in Methods that are stored in CDS archive 
This optimization reduces the size of the RW region of the CDS archive. It also reduces the amount of pages in the RW region that are actually written into during runtime.

Co-authored-by: Ioi Lam <ioi.lam@oracle.com>
Co-authored-by: Goetz Lindenmaier <goetz.lindenmaier@sap.com>
Reviewed-by: dlong, iklam, jiangli
 2016-04-07 22:03:04 -07:00
Brent Christian
2d2abce433 8153123: Streamline StackWalker code 
Reviewed-by: coleenp, dfuchs, mchung, redestad
 2016-04-08 12:26:29 -07:00
Bharadwaj Yadavalli
1e6ac67ecf 8153816: [BACKOUT] Make intrinsics flags diagnostic 
Backout fix for 8145348

Reviewed-by: kvn, jwilhelm
 2016-04-08 01:00:10 -04:00
Sangheon Kim
25f35cda7d 8152182: Possible overflow in initialzation of _rescan_task_size and _marking_task_size 
Add constraints for CMSRescanMultiple and CMSConcMarkMultiple flags

Reviewed-by: jwilhelm, jmasa
 2016-04-07 15:34:21 -07:00
Sangheon Kim
10c7cac93e 8152180: SIGFPE in CMSCollector::preclean with big CMSScheduleRemarkSamplingRatio 
Rephrased the calculation routine to avoid an overflow for CMSScheduleRemarkSamplingRatio

Reviewed-by: jwilhelm, drwhite
 2016-04-07 15:33:25 -07:00
Coleen Phillimore
c66cf8bde7 Merge 2016-04-07 21:24:12 +00:00
Coleen Phillimore
0d3e7977ae 8151939: VM_Version_init() print buffer is too small 
Increase buffer size, use logging to print out version and os information

Reviewed-by: kvn, rprotacio, mockner
 2016-04-07 16:37:35 -04:00
Daniel D. Daugherty
4f3b1c9ed5 Merge 2016-04-07 12:54:48 -07:00
Lana Steuck
50d3fe6b48 Merge 2016-04-07 11:04:36 -07:00
Rachel Protacio
02d268d760 8152896: Convert PrintCompressedOopsMode to Unified Logging 
Converted -XX:+PrintCompressedOopsMode to -Xlog:gc+heap+coops and aliased old option

Reviewed-by: coleenp, sjohanss, kvn, hseigel
 2016-04-07 13:11:15 -04:00
Lana Steuck
6a0cae9d3c Added tag jdk-9+113 for changeset 9bc1d0332a48 2016-04-07 10:06:57 -07:00
Daniel D. Daugherty
4397e85e26 Merge 2016-04-07 09:47:48 -07:00
Dmitry Fazunenko
efb6b67d27 Merge 2016-04-07 15:01:56 +00:00
Thomas Schatzl
a9cf95480f 8153734: TestHumongousReferenceObject.java occasionally crashes with "unable to allocate heap of 1g" on win32 
Decrease the heap size used in the test from 1g to 128M.

Reviewed-by: dfazunen, sjohanss
 2016-04-07 15:17:08 +02:00
Michail Chernov
0202ef201c 8153516: Hotspot TEST.group has error in GC groups definition 
Reviewed-by: tschatzl, dfazunen
 2016-04-07 16:01:16 +03:00
Michail Chernov
412ce42184 8148376: Test for PLAB behavior at evacuation failure 
Reviewed-by: tschatzl, dfazunen
 2016-04-07 15:58:24 +03:00
Dmitry Fazunenko
2b7a70a9d3 8152432: Implement setting jtreg @requires properties vm.flavor, vm.bits, vm.compMode 
Reviewed-by: iignatyev
 2016-04-07 17:42:30 +04:00
Martin Doerr
611e659be1 8153267: nmethod's exception cache not multi-thread safe 
Reviewed-by: aph, jcm, kvn
 2016-04-07 12:33:58 +02:00
Zoltan Majo
cd3197f341 8151708: C1 FastTLABRefill can allocate TLABs past the end of the heap 
Use branch instruction that checks xcc instead of icc.

Reviewed-by: kvn, thartmann
 2016-04-15 07:54:31 +02:00
Pavel Punegov
dc3f4fbc96 Merge 2016-04-14 18:15:41 +02:00
Pavel Punegov
3a407ecde7 Merge 2016-04-14 15:28:46 +02:00
Tobias Hartmann
63403a410e 8154073: Several compiler tests fail when are executed with C1 only 
Added missing flag checks to the tests and Whitebox API.

Reviewed-by: kvn
 2016-04-14 08:32:39 +02:00
Pavel Punegov
792ccb5056 8153852: [jittester] move TypeUtil to utils package 
Rewrite TypeUtil and move to utils package

Reviewed-by: kvn
 2016-04-13 18:56:51 +03:00
Pavel Punegov
82dc0d42a6 8140354: Unquarantine tests that failed with OutOfMemoryError 
Unquarantine CompilerControl tests

Reviewed-by: iignatyev
 2016-04-13 18:31:43 +03:00
Vladimir Kozlov
e33bf84754 8153818: Move similar CompiledIC platform specific code to shared code 
Reviewed-by: iveresov, twisti
 2016-04-12 17:12:51 -07:00
Igor Veresov
eb6d600333 8153115: Move private interface check to linktime 
Check for private interface methods during linktime instead of runtime

Reviewed-by: kvn, never, coleenp, acorn, lfoltan
 2016-04-12 14:55:18 -07:00
Bharadwaj Yadavalli
b2ead5ac2d Merge 2016-04-12 14:17:42 -04:00
Nils Eliasson
a74ee72e1e 8153885: [TESTBUG] few regression tests failed after 8151880 changes 
Test that uses compile() as missed in update

Reviewed-by: kvn
 2016-04-12 11:29:08 +02:00
Fei Yang
8215de72f5 8153713: aarch64: improve short array clearing using store pair 
Aarch64: generate store pair instruction to clear short arrays

Reviewed-by: aph
 2016-04-12 11:53:44 +08:00
Antonios Printezis
f22c068365 8152312: ParNew: Restore preserved marks in parallel 
Reviewed-by: tschatzl
 2016-04-07 10:55:54 +02:00
Daniel D. Daugherty
e266e56356 Merge 2016-04-06 23:42:52 +00:00
Daniel D. Daugherty
0fc167eb01 Merge 2016-04-06 15:49:40 -07:00
Calvin Cheung
5e6ae86ef2 Merge 2016-04-07 00:25:46 +02:00
Jesper Wilhelmsson
3f00e1fcef 8153671: Quarantine serviceability/tmtools/jstack/JstackThreadTest.java until JDK-8153319 is fixed 
Reviewed-by: jprovino, dcubed
 2016-04-06 14:51:39 -07:00
Calvin Cheung
c282f25964 8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive 
Reviewed-by: iklam, jiangli, mseledtsov
 2016-04-06 11:40:45 -07:00
Filipp Zhinkin
6b6686bd43 8149374: Replace C1-specific collection classes with universal collection classes 
Reviewed-by: kvn, mgerdin, coleenp
 2016-04-06 18:51:03 +03:00
Vladimir Ivanov
7fc81004e3 8152590: C2: @Stable support doesn't always work w/ incremental inlining 
Reviewed-by: kvn
 2016-04-11 21:42:55 +03:00
Vladimir Ivanov
0c233de7ff 8138861: C2 complains about unreasonably large method running Octane zlib in Nashorn 
Reviewed-by: kvn
 2016-04-11 21:42:31 +03:00
Long Chen
19d90c789d 8153797: aarch64: Add Arrays.fill stub code 
Reviewed-by: aph
 2016-04-07 22:36:16 +00:00
Doug Simon
1131e05b66 8153439: do not install an empty SpeculationLog in an nmethod 
Reviewed-by: iveresov, twisti
 2016-04-07 08:57:26 -10:00
Nils Eliasson
d9c49d2be5 Merge 2016-04-07 18:27:50 +02:00
Tobias Hartmann
a6c687cd6a 8153514: Whitebox API should allow compilation of <clinit> 
Added Whitebox API method to trigger compilation of static initializer.

Reviewed-by: zmajo, kvn, iignatyev
 2016-04-07 16:51:37 +02:00
Tobias Hartmann
7502a7a7f2 Merge 2016-04-07 12:16:03 +00:00
Aleksey Shipilev
a5c6b5ee3f Merge 2016-04-07 10:50:08 +00:00
Rahul Raghavan
28e72b2675 8149488: Incorrect declaration of bitsInByte in regmask.cpp 
Corrected BITS_IN_BYTE_ARRAY_SIZE value as 256 for all bitsInByte usage.

Reviewed-by: dlong, mcberg, thartmann, vlivanov
 2016-04-07 01:56:16 -07:00
Harold Seigel
27216177ce Merge 2016-04-06 16:03:02 +02:00
Nils Eliasson
c70e07ccbe 8151880: EnqueueMethodForCompilationTest.java still fails to compile method 
Extract SimpleTestCaseHelper inner class

Reviewed-by: kvn
 2016-04-06 14:48:45 +02:00
Yasumasa Suenaga
af3081628b 8152435: (CL)HSDB should be started with no argument 
Reviewed-by: dsamersoff
 2016-04-06 20:43:03 +09:00
Thomas Schatzl
a009aa9ca7 8151386: Extract card live data out of G1ConcurrentMark 
Move card live data management out of G1ConcurrentMark into extra class G1CardLiveData managed by G1RemSet

Reviewed-by: mgerdin, kbarrett
 2016-04-06 13:41:59 +02:00
Harold Seigel
2904ea7d45 8152846: Creation of ModuleEntryTable Investigate Need For OrderAccess::storestore() 
Remove the unneeded OrderAccess::storestore() call

Reviewed-by: acorn, coleenp
 2016-04-06 07:37:15 -04:00
Thomas Schatzl
0c06163b35 8077144: Concurrent mark initialization takes too long 
Remove per-marking thread liveness bitmaps and recreate liveness bitmap concurrently after the cleanup pause.

Reviewed-by: mgerdin, ehelin, kbarrett
 2016-04-06 13:32:48 +02:00
Aleksey Shipilev
b349843be4 8153265: [TESTBUG] compiler/whitebox/ForceNMethodSweepTest should not assume asserts are benign 
Reviewed-by: twisti, ikrylov
 2016-04-06 10:55:46 +03:00
Shravya Rukmannagari
ad79a5ae65 8152907: Update for x86 tan and log10 in the math lib 
Optimize Math.tan() and log10() for 64 and 32 bit X86 architecture using Intel LIBM  implementation.

Reviewed-by: kvn, twisti
 2016-04-06 10:29:26 -07:00
Aleksey Shipilev
b51a55a78c 8153277: [TESTBUG] gc/arguments/TestMaxMinHeapFreeRatioFlags is too sensitive for stray allocations in verifyRatio 
Reviewed-by: mgerdin, dfazunen
 2016-04-06 10:50:19 +03:00
Sangheon Kim
2f5768493d Merge 2016-04-05 23:59:12 +00:00
Sangheon Kim
7908c3db94 8152188: Allow CMSBitMapYieldQuantum for BitMap::clear_range and clear_large_range 
Let BitMap::clear_large_range call clear_range instead of firing an assert

Reviewed-by: jmasa, jwilhelm
 2016-04-05 16:15:53 -07:00
Ioi Lam
3d629c6dd3 8153300: [TESTBUG] Enhance test/testlibrary/ClassFileInstaller.java to support JAR files 
Reviewed-by: lfoltan, mseledtsov
 2016-04-05 14:52:12 -07:00
Bharadwaj Yadavalli
cf5871861f Merge 2016-04-05 20:32:54 +00:00
Bharadwaj Yadavalli
e258fc4bc7 Merge 2016-04-05 15:39:35 -04:00