stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,928 Commits 2 Branches 0 Tags 1.2 GiB
4250926e07
Commit Graph

7490 Commits

Author SHA1 Message Date
Jesper Wilhelmsson
5cb1dff557 Merge 2014-10-27 20:00:04 +01:00
Jon Masamitsu
f01e2584c7 Merge 2014-10-27 16:39:29 +00:00
Andrey Zakharov
b9c70becab 8059614: [TESTBUG] Test for UseNUMA enable UseNUMAInterleaving 
Tests that UseNUMAInterleaving enabled for all collectors by ergonomics, on all platforms when UseNUMA feature is enabled.

Reviewed-by: jmasa, dfazunen
 2014-10-27 07:52:49 -07:00
Alejandro Murillo
ea60f1eddd Merge 2014-10-27 07:49:54 -07:00
Harold Seigel
f5c3ac04e4 8061962: classFileParser.cpp.orig got erroneously added to the hotspot source repository 
Remove the file

Reviewed-by: coleenp, ccheung
 2014-10-24 08:56:47 -04:00
Boris Molodenkov
f55d90353f 8057135: [TESTBUG] Need a test to cover JDK-8050167 
Reviewed-by: ctornqvi, coleenp
 2014-10-24 12:32:53 +04:00
Chris Plummer
5306f2430a 6191224: (reflect) Misleading detail string in IllegalArgumentException thrown by Array.get<Type> 
The test case shows that an exception is thrown with the message "Argument is not an array", when in fact the argument is an array, but an array of a primitive type is actually what was expected. Fixed by differentiating between failing because an array was expected and failing because an array of a primitive type was expected.

Reviewed-by: dholmes, ctornqvi, lfoltan
 2014-10-23 14:43:08 -07:00
Lana Steuck
88ecaa471d Merge 2014-10-23 13:44:59 -07:00
Kim Barrett
8f8d87ece5 8061748: Remove check_ct_logs_at_safepoint() 
Remove unused function and related closure class

Reviewed-by: jwilhelm, mgerdin
 2014-10-23 16:19:32 -04:00
David Katleman
94c271fa96 Added tag jdk9-b36 for changeset 1f97f4f1b7d9 2014-10-23 11:19:10 -07:00
Calvin Cheung
1aa3da1067 8038268: VM Crashes in MetaspaceShared::generate_vtable_methods while creating CDS archive with limiting SharedMiscCodeSize 
Estimate the minimum required size for the misc code region and check if the specified misc code region size meets the minimum size requirement

Reviewed-by: jiangli, dholmes
 2014-10-23 10:08:02 -07:00
Jesper Wilhelmsson
84aecba04d Merge 2014-10-23 17:36:30 +02:00
Jesper Wilhelmsson
5c52a46b60 Merge 2014-10-23 17:36:30 +02:00
Erik Helin
3a3e45ab40 8061630: G1 iterates over JNIHandles two times 
Reviewed-by: mgerdin, brutisso
 2014-10-23 11:43:29 +02:00
Karen Kinnear
397e42b775 Merge 2014-10-22 22:37:06 +00:00
Karen Kinnear
0e1283a811 8043275: Fix interface initialization for default methods 
Initialize interfaces that declare concrete instance methods.

Reviewed-by: kamg, coleenp, psandoz
 2014-10-22 15:24:37 -07:00
Jesper Wilhelmsson
27e9dd8a8d 8061805: BACKOUT - Remove the generations array 
Backing out the change due to non-trivial test problems in nightly testing.

Reviewed-by: jwilhelm, mgerdin
 2014-10-22 16:40:43 +02:00
Andreas Eriksson
ea48bceb5e 8057043: Type annotations not retained during class redefine / retransform 
Reviewed-by: coleenp, sspitsyn, jfranck
 2014-10-22 13:59:56 +02:00
Frederic Parain
209ffcd9a5 8061618: Removed unused networking functions from os class 
Reviewed-by: lfoltan, hseigel, dholmes
 2014-10-22 02:31:25 -07:00
Erik Osterlund
a324ff0f31 8058255: Native jbyte Atomic::cmpxchg for supported x86 platforms 
Use the native cmpxchgb instruction on x86.

Reviewed-by: dholmes, kbarrett, phh
 2014-10-21 15:07:25 +02:00
Bengt Rutisson
a5d4521aa1 Merge 2014-11-18 12:33:47 +00:00
Erik Helin
491a4a8ea6 Merge 2014-11-18 11:10:02 +00:00
Bengt Rutisson
2da855a259 8064865: Remove the debug funciontality RotateCMSCollectionTypes for CMS 
Reviewed-by: jmasa, kbarrett, ysr
 2014-11-18 10:39:16 +01:00
Erik Helin
f3997d8eed 8064721: The card tables only ever need two covering regions 
Reviewed-by: jmasa, tschatzl, kbarrett
 2014-11-18 10:36:42 +01:00
Bengt Rutisson
4b60638d85 8064702: Remove the CMS foreground collector 
Reviewed-by: kbarrett, ysr
 2014-11-18 10:23:26 +01:00
Jesper Wilhelmsson
2616e09389 Merge 2014-11-17 21:32:32 +01:00
Stefan Karlsson
eebf2b9126 8064581: Move INCLUDE_ALL_GCS include section to the end of the include list 
Reviewed-by: jwilhelm, brutisso, coleenp, dholmes
 2014-11-12 12:41:59 +01:00
Stefan Karlsson
d326162380 8064580: Move INCLUDE_CDS include section to the end of the include list 
Reviewed-by: jwilhelm, brutisso, coleenp, dholmes
 2014-11-11 17:05:33 +01:00
Staffan Friberg
04bdb774e1 8064473: Improved handling of age during object copy in G1 
Reviewed-by: brutisso, tschatzl
 2014-11-14 15:03:39 +01:00
Mikael Gerdin
4feb7b4dab 8058209: Race in G1 card scanning could allow scanning of memory covered by PLABs 
Read _top before _gc_time_stamp in saved_mark_word() with LoadLoad order to ensure we get a consistent view

Reviewed-by: brutisso, dcubed, dholmes, stefank
 2014-11-14 14:23:25 +01:00
Stefan Karlsson
95704b233c 8064811: Use THREAD instead of CHECK_NULL in return statements 
Reviewed-by: coleenp, simonis, dholmes
 2014-11-14 09:47:09 +01:00
Goetz Lindenmaier
3b31df26c8 8064786: Fix debug build after 8062808: Turn on the -Wreturn-type warning 
Reviewed-by: stefank, tschatzl
 2014-11-13 11:14:01 +01:00
Kim Barrett
294a63af5f 8062036: ConcurrentMarkThread::slt may be invoked before ConcurrentMarkThread::makeSurrogateLockerThread causing intermittent crashes 
Suppress gc_alot during VM init, improve error for SLT uninitialized.

Reviewed-by: jmasa, brutisso, tschatzl
 2014-11-11 13:39:00 -05:00
Stefan Karlsson
692dbfd02d 8062808: Turn on the -Wreturn-type warning 
Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
 2014-11-12 13:55:59 +01:00
Marcus Larsson
46e9fb5176 6979279: remove special-case code for ParallelGCThreads==0 
Reviewed-by: jwilhelm, brutisso, kbarrett
 2014-10-21 11:57:22 +02:00
Roland Westrelin
79738069b0 8060252: JDK-7173584 compiler changes regress SPECjvm2008 on SPARC 
Arraycopy code misses opportunities to optimize copies to just allocated array.

Reviewed-by: kvn
 2014-10-20 22:53:37 +02:00
Vladimir Kozlov
8cd1a874e8 8059780: SPECjvm2008-MPEG performance regressions on x64 platforms 
Back-out 8052081 changes made in lcm.cpp.

Reviewed-by: iveresov, roland
 2014-11-03 12:02:40 -08:00
Sergei Kovalev
8152a3ea35 8044186: Introduce a reproducible random generator 
Reviewed-by: kvn, iveresov, iignatyev
 2014-11-02 18:43:38 +03:00
Igor Ignatyev
e429e497ce 8043125: compiler/types/correctness/CorrectnessTest.java: assert(layout->tag() == DataLayout::speculative_trap_data_tag) failed: wrong type 
Reviewed-by: kvn
 2014-11-02 18:43:00 +03:00
Igor Ignatyev
e5a126fe00 8036913: make DeoptimizeALot dependent on number of threads 
Reviewed-by: kvn, shade
 2014-11-02 18:42:30 +03:00
Vladimir Kozlov
74def215cd 8054492: Casting can result in redundant null checks in generated code 
Add C2 intrinsic for Class.cast() method and force inline it too.

Reviewed-by: jrose, roland, drchase, iignatyev
 2014-10-31 16:51:57 -07:00
Igor Veresov
daf2fd0593 Merge 2014-10-31 12:01:27 -10:00
Tobias Hartmann
7d202a428b Merge 2014-10-31 11:31:30 +00:00
Tobias Hartmann
62d33442b8 8062169: Multiple OSR compilations issued for same bci 
Fixed 'SimpleThresholdPolicy::event' to always perform OSR if an OSR nmethod is available.

Reviewed-by: kvn, iveresov
 2014-10-31 12:16:20 +01:00
Stefan Johansson
bd227a9bac 8058568: GC cleanup phase can cause G1 skipping a System.gc() 
Marking G1 FullGC as a _full collection and passing down the correct before count.

Reviewed-by: brutisso, mgerdin
 2014-10-20 10:18:17 +02:00
Daniel D. Daugherty
aed4b0760c Merge 2014-10-18 11:37:11 -07:00
Alejandro Murillo
c3b487d84f Merge 2014-10-17 07:58:54 -07:00
Daniel D. Daugherty
31986657eb Merge 2014-10-17 06:58:57 -07:00
Lana Steuck
2b931469de Merge 2014-10-16 14:15:37 -07:00
David Katleman
f0c24e1a0f Added tag jdk9-b35 for changeset 58090065f895 2014-10-16 12:01:59 -07:00
Jiangli Zhou
cc264643ac 8060256: The loop in Arguments::parse() can be enhanced 
Add continue statement for matching cases.

Reviewed-by: dholmes, bdelsart
 2014-10-16 14:11:53 -04:00
Daniel D. Daugherty
f7f1cca26e Merge 2014-10-16 17:36:47 +00:00
Jesper Wilhelmsson
1570e4c406 Merge 2014-10-16 15:59:39 +00:00
George Triantafillou
b79e1193cd 8058606: [TESTBUG] Detailed Native Memory Tracking (NMT) data is not verified as output at VM exit 
Reviewed-by: coleenp, hseigel
 2014-10-15 05:55:44 -07:00
Zoltan Majo
ed26c7e640 8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation) 
This patch adds a new flag (CompileThresholdScaling) to control when methods are first compiled

Reviewed-by: anoll, iveresov, kvn
 2014-10-15 14:00:41 +02:00
Zoltan Majo
bde7fd61b4 8060215: per-method PrintIdealGraphLevel 
Use CompileCommand=option to set PrintIdealGraphLevel on a per-method level. Introduce the PrintIdealGraph develop to control/check if printing the graph is enabled for any method

Reviewed-by: kvn, dlong, thartmann
 2014-10-15 10:51:43 +02:00
Jiangli Zhou
ad65e81ce7 8044269: Analysis of archive files 
Add checksum verification.

Reviewed-by: iklam, dholmes, mschoene
 2014-10-14 18:47:46 -07:00
Jesper Wilhelmsson
1055ae0436 Merge 2014-10-14 20:35:45 +00:00
Jiangli Zhou
01f7696c6d Merge 2014-10-14 19:39:28 +00:00
Sangheon Kim
8d288ccc54 8027428: Different conditions for printing taskqueue statistics for parallel gc, parNew and G1 
Changed flag names for printing taskqueue and termination statistics for parallel gc, parNew and G1.

Reviewed-by: jwilhelm, brutisso, tschatzl
 2014-10-14 20:58:43 +02:00
Marcus Larsson
d10dd28393 8060116: After JDK-8047976 gc/g1/TestSummarizeRSetStatsThreads fails 
Also reviewed by: sangheon.kim@oracle.com

Reviewed-by: brutisso
 2014-10-14 19:55:54 +02:00
Jiangli Zhou
5b06cbcdad Merge 2014-10-14 13:43:47 -04:00
Daniel D. Daugherty
f1ab0fae73 8049737: Contended Locking reorder and cache line bucket 
JEP-143/JDK-8046133 - optimization #1 - reorder and cache line bucket.

Co-authored-by: Dave Dice <dave.dice@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Reviewed-by: shade, dice, dholmes, dsimms
 2014-10-14 10:32:12 -07:00
Jiangli Zhou
d7fe532761 8047934: Adding new API for unlocking diagnostic argument 
New API for unlocking diagnostic argument.

Reviewed-by: dholmes, ccheung, egahlin, iklam, bdelsart
 2014-10-14 12:09:33 -04:00
Thomas Stuefe
51866388d1 7102541: RFE: os::set_native_thread_name() cleanups 
Implement os::set_native_thread_name() on windows, linux

Reviewed-by: sla, ctornqvi, simonis
 2014-10-13 22:11:39 +02:00
Jesper Wilhelmsson
1934c66969 Merge 2014-10-13 16:05:46 +02:00
Tobias Hartmann
38e46e728d 8046268: compiler/whitebox/ tests fail : must be osr_compiled 
Added code to 'warm up' the methods before triggering OSR compilation by executing them a limited number of times. Like this, the profile information marks the loop exit as taken and we don't add an uncommon trap.

Reviewed-by: kvn, dlong, iignatyev
 2014-10-13 12:30:37 +02:00
Coleen Phillimore
c5dbe0cf46 Merge 2014-10-10 21:47:04 +00:00
Coleen Phillimore
3a86f9cd27 8059100: SIGSEGV VirtualMemoryTracker::remove_released_region 
Disallow increasing native memory tracking level

Reviewed-by: hseigel, ctornqvi, gtriantafill
 2014-10-10 19:36:12 +00:00
Daniel D. Daugherty
f5bcc77f94 Merge 2014-10-10 18:00:14 +00:00
Daniel D. Daugherty
c70dbd3959 Merge 2014-10-10 08:28:12 -07:00
Albert Noll
aed6e5a976 Merge 2014-10-10 13:26:23 +00:00
Albert Noll
026dd65916 Merge 2014-10-10 13:05:49 +00:00
Albert Noll
e210688db9 8059847: complement JDK-8055286 and JDK-8056964 changes 
Extend scan_flag_and_value() to process flag of type double. Add regression test compiler/oracle/CheckCompileCommandOption.java.

Reviewed-by: kvn, anoll
 2014-10-10 14:48:30 +02:00
Sangheon Kim
3f18eda414 8058801: G1TraceReclaimDeadHumongousObjectsAtYoungGC only prints humongous object liveness output when there is at least one candidate humongous object 
If G1TraceReclaimDeadHumongousObjectsAtYoungGC is enabled, always print humongous object liveness output.

Reviewed-by: tschatzl
 2014-10-10 12:15:51 +02:00
Alejandro Murillo
f8d533e6b6 Merge 2014-10-10 02:24:35 -07:00
Serguei Spitsyn
99096d6e68 8059904: libjvm_db.c warnings in solaris/sparc build with SS 
Fix warnings by correcting the cast of pointers returned from calloc()

Reviewed-by: dholmes
 2014-10-09 16:56:27 -07:00
Staffan Friberg
8b424b422f 8057737: Avoid G1 write barriers on newly allocated objects 
Reviewed-by: mgerdin, kvn, iveresov
 2014-10-09 13:06:15 -07:00
Igor Veresov
7d595c0799 Merge 2014-10-09 12:36:20 -07:00
Lana Steuck
ce26e95e4f Merge 2014-10-09 12:17:17 -07:00
David Katleman
28ce04fffe Added tag jdk9-b34 for changeset 8af850ba9862 2014-10-09 11:24:04 -07:00
Aleksey Shipilev
fe03f41db8 8059924: com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java: assert(Universe::verify_in_progress() || !SafepointSynchronize::is_at_safepoint()) failed: invariant 
Revive the hashcode installation in Verifier

Reviewed-by: kamg, lfoltan
 2014-10-09 16:41:28 +04:00
Frederic Parain
94af790733 8057777: Cleanup of old and unused VM interfaces 
Reviewed-by: coleenp, hseigel, alanb, sherman
 2014-10-09 04:45:58 -07:00
Jesper Wilhelmsson
067456b11d Merge 2014-10-09 13:42:29 +02:00
Thomas Schatzl
60f3ade82b 8059758: Footprint regressions with JDK-8038423 
Changes in JDK-8038423 always initialize (zero out) virtual memory used for auxiliary data structures. This causes a footprint regression for G1 in startup benchmarks. This is because they do not touch that memory at all, so the operating system does not actually commit these pages. The fix is to, if the initialization value of the data structures matches the default value of just committed memory (=0), do not do anything.

Reviewed-by: jwilhelm, brutisso
 2014-10-09 11:40:11 +02:00
Tobias Hartmann
3ed02be10e 8059735: make_not_entrant_or_zombie sees zombies 
Make sure nmethod is not set to zombie state twice by sweeper and safepoint code.

Reviewed-by: kvn, anoll, mgerdin
 2014-10-08 09:23:18 +02:00
John Coomes
ecfa03bddc Merge 2014-10-07 15:44:11 -07:00
Marcus Larsson
6d1c35615a 8058298: Separate heap region iterator claim values from the data structures iterated over 
Reviewed-by: tschatzl, brutisso
 2014-10-07 14:54:53 +02:00
Albert Noll
82171aa7ab 8059331: Print additional information for the assert in Compile::start() 
Add additional output that shows the failure reason

Reviewed-by: kvn
 2014-10-06 06:51:37 -07:00
Roland Westrelin
f575843d51 8058746: escape analysis special case code for array copy broken by 7173584 
Escape analysis doesn't handler arraycopy nodes properly

Reviewed-by: kvn, iveresov, vlivanov
 2014-10-06 14:53:30 +02:00
Stefan Johansson
18eb46eb95 8059466: Force young GC to initiate marking cycle when stat update is requested 
Enable yc to be forced for stat update.

Reviewed-by: mgerdin, jcoomes
 2014-10-06 10:11:13 +02:00
Tobias Hartmann
4c1c76ae4f 8059559: SIGSEGV at CodeHeap::allocate(unsigned int, bool) 
Create the non-profiled code heap if TieredStopAtLevel=0 is set because we compile method handle intrinsics.

Reviewed-by: kvn
 2014-10-06 07:58:50 +02:00
Chris Plummer
db57351f43 8046607: Code cleanup: PerfMemory::backing_store_filename() should be removed 
Removed PerfMemory::backing_store_filename() API since it is not used anywhere.

Reviewed-by: sla, hseigel
 2014-10-03 13:56:18 -07:00
Gerard Ziemski
259a454043 Merge 2014-10-03 15:41:56 -05:00
Igor Veresov
c39454ae56 8059621: JVM crashes with "unexpected index type" assert in LIRGenerator::do_UnsafeGetRaw 
Get types from LIR instructions instead of HIR

Reviewed-by: kvn
 2014-10-03 13:34:46 -07:00
Lana Steuck
dcd1a49883 Merge 2014-10-03 12:11:14 -07:00
Igor Veresov
8327c8c62e Merge 2014-10-03 11:14:58 -07:00
Lana Steuck
272bbf52b6 Added tag jdk9-b33 for changeset 1197007e187c 2014-10-03 11:07:02 -07:00
Jesper Wilhelmsson
4a82f3067a Merge 2014-10-03 13:00:21 +02:00
Marcus Larsson
08dd794b92 8059651: Tests specify -XX:+UseG1GC and -XX:ParallelGCThreads=0 
Reviewed-by: jwilhelm, brutisso
 2014-10-03 10:05:11 +02:00
Coleen Phillimore
a791dae7b4 Merge 2014-10-03 03:31:30 +00:00
Ioi Lam
da6e20fd64 Merge 2014-10-03 02:59:14 +00:00
Igor Veresov
0f0d955738 Merge 2014-10-03 01:10:39 +00:00
Jesper Wilhelmsson
07d76f58c8 Merge 2014-10-03 00:21:49 +02:00
Coleen Phillimore
90200446c1 8047736: Remove JVM_GetClassLoader as no longer used 
Remove this function from hotspot.  It's already removed from the JDK.

Reviewed-by: mchung, fparain, ctornqvi
 2014-10-02 16:31:44 -04:00
Ioi Lam
2b2786873d Merge 2014-10-02 12:55:40 -07:00
Igor Veresov
5a0ca33566 Merge 2014-10-02 12:31:03 -07:00
Aleksey Shipilev
0ba4969549 8059595: Verifier::verify is wasting time before is_eligible_for_verification check 
Do the check earlier.

Reviewed-by: hseigel, kamg
 2014-10-02 17:13:31 +04:00
Tobias Hartmann
c410cd3bfb 8059596: VM startup fails with 'Invalid code heap sizes' if -XX:ReservedCodeCacheSize is set 
Only increase code heap sizes in Arguments::set_tiered_flags() if reserved code cache size is default.

Reviewed-by: shade, vlivanov, sla
 2014-10-02 12:58:37 +02:00
Marcus Larsson
628fcb087d 8059527: Disallow ParallelGCThreads=0 for G1 
Reviewed-by: ehelin, brutisso
 2014-10-02 11:22:02 +02:00
Goetz Lindenmaier
3263a62bb4 8059592: Recent bugfixes in ppc64 port 
Reviewed-by: kvn
 2014-10-02 09:32:53 +02:00
Vladimir Kozlov
d124a839ce 8059299: assert(adr_type != NULL) failed: expecting TypeKlassPtr 
Use top() for dead paths when initializing Phi node of exceptions klasses in Parse::catch_inline_exceptions().

Reviewed-by: jrose, vlivanov
 2014-10-02 11:36:44 -07:00
Ioi Lam
235ae5eb62 Merge 2014-10-01 15:24:34 -07:00
Vladimir Ivanov
5a5f718b6f 8059556: C2: crash while inlining MethodHandle invocation w/ null receiver 
Reviewed-by: kvn, jrose
 2014-10-01 12:34:45 -07:00
Vladimir Ivanov
0a751b424f 8058828: Wrong ciConstant type for arrays from ConstantPool::_resolved_reference 
Reviewed-by: kvn, jrose
 2014-10-01 12:34:38 -07:00
Igor Veresov
2fa26393fb Merge 2014-10-01 11:43:03 -07:00
Erik Helin
6f4355a3a6 8049599: MetaspaceGC::_capacity_until_GC can overflow 
Reviewed-by: jmasa, stefank
 2014-10-01 16:09:01 +02:00
Tobias Hartmann
8fcc715e8a Merge 2014-10-01 09:40:43 +00:00
Aleksey Shipilev
8c9dff938c 8059474: Clean up vm/utilities/Bitmap type uses 
Reviewed-by: coleenp, mgerdin
 2014-10-01 12:29:28 +04:00
Zoltan Majo
72eb3f0643 8059390: code cache fills up for bigapps/Weblogic+medrec/nowarnings 
Retrieve code heap in CodeCache::allocate(), ::report_codemem_full(), and ::unallocated_capacity()  also if segmented code cache is disabled.

Reviewed-by: vlivanov, thartmann
 2014-10-01 10:01:46 +02:00
Tobias Hartmann
ea755702aa 8059468: Fix PrintCodeCache output changed by JDK-8059137 
Change output of PrintCodeCache to print "CodeCache" instead of "Code Cache" and change name of non-method code heap to non-nmethod code heap.

Reviewed-by: vlivanov, anoll
 2014-09-30 15:44:43 +02:00
Bengt Rutisson
82931dcc1c 8059452: G1: Change the default values for G1HeapWastePercent and G1MixedGCLiveThresholdPercent 
Reviewed-by: tschatzl, jwilhelm
 2014-09-30 13:14:22 +02:00
Nils Eliasson
609974cfdd 8058891: serviceability/dcmd/CodelistTest.java - fails on all platforms 
Fix can not reflect MethodHandles

Reviewed-by: kvn, drchase
 2014-09-30 10:22:58 +02:00
Tobias Hartmann
3525490c57 8059137: MemoryPoolMXBeans for different code heaps should contain 'Code heap' in their names 
The segmented code cache implementation registers a memory pool for each code heap. To be consistent with the "non-segmented" output, the names of these pools should contain the word "code heap".

Reviewed-by: kvn, sla, fzhinkin
 2014-09-30 09:06:39 +02:00
Goetz Lindenmaier
1d9e66c743 8058880: Introduce identifier TEMP_DEF for effects in adl 
Modified adlc sources.

Reviewed-by: kvn, drchase
 2014-09-29 16:03:30 -04:00
Vladimir Ivanov
55291de970 8058825: EA: ConnectionGraph::split_unique_types does incorrect scalar replacement 
Reviewed-by: kvn
 2014-09-29 11:46:05 -07:00
Evgeniya Stepanova
a73a5247a5 8038098: [TESTBUG] remove explicit set build flavor from hotspot/test/compiler/* tests 
Reviewed-by: iignatyev, vlivanov, kvn, fzhinkin
 2014-09-29 09:32:15 -07:00
Evgeniya Stepanova
dc7da7467b 8025606: [TESTBUG] Move ctw-tests to /testlibrary_tests 
Reviewed-by: iignatyev, vlivanov, kvn
 2014-09-29 09:29:24 -07:00
Vladimir Ivanov
872804d9dc 8058578: -XX:+TraceDependencies is broken for call_site_target_value dependency type 
Reviewed-by: jrose, kvn
 2014-09-29 09:26:48 -07:00
Erik Helin
179b5f7fd1 Merge 2014-09-29 12:05:44 +00:00
Erik Helin
d072dfaf9d 8058963: CollectorPolicy::satisfy_failed_metadata_allocation can avoid some safepoints 
Reviewed-by: brutisso, mgerdin
 2014-09-29 10:38:50 +02:00
Andrey Zakharov
c01e7966b6 8043766: CMM Testing: 8u40 Decommit auxiliary data structures 
Check that native memory is returned to the system when decommiting memory within the heap with G1.

Reviewed-by: tschatzl, jwilhelm
 2014-09-29 09:59:23 +02:00
Jesper Wilhelmsson
261735f6fa 8047976: Ergonomics for GC thread counts should update the flags 
Ergonomics updates flags for number of GC threads

Reviewed-by: tschatzl, jwilhelm
 2014-09-27 15:11:41 +02:00
Ioi Lam
4c5840ada6 Merge 2014-09-26 17:55:09 -07:00
Coleen Phillimore
d3a84af0af Merge 2014-09-26 18:59:09 -04:00
Coleen Phillimore
866de7bb9c 8057846: ClassVerifier::change_sig_to_verificationType temporary symbol creation code is hot 
Only update the refcount without looking it up in the symbol table.

Reviewed-by: hseigel, lfoltan, shade
 2014-09-26 17:11:27 -04:00
Coleen Phillimore
ae9681a5cf 8058927: ATG throws ClassNotFoundException 
ClassLoader for array klass set to null and not the class loader of the component type.

Reviewed-by: dcubed, ctornqvi
 2014-09-26 12:50:30 -04:00
Alejandro Murillo
854f91fd5b Merge 2014-09-26 01:40:31 -07:00
Jesper Wilhelmsson
b15f3b438d Merge 2014-09-26 06:07:48 +00:00
Lana Steuck
e20499314f Merge 2014-09-25 16:21:54 -07:00
Niclas Adlertz
a15b864ec9 Merge 2014-09-25 23:37:41 +02:00
David Katleman
feb5f12af6 Added tag jdk9-b32 for changeset 16409c45f454 2014-09-25 12:40:17 -07:00
Coleen Phillimore
968d1fec16 Merge 2014-09-25 12:04:28 +00:00
Coleen Phillimore
31b9cf6251 8058818: Allocation of more then 1G of memory using Unsafe.allocateMemory is still causing a fatal error on 32bit platforms 
The assert was firing for NMT_Off and minimal too even though the size isn't used.

Reviewed-by: gtriantafill, dholmes
 2014-09-25 07:52:32 -04:00
Dmitry Samersoff
1ac95fd847 8054194: jstack crash: assert(handle != NULL) failed: JNI handle should not be null 
Add better error check to sa to avoid secondary crash

Reviewed-by: sla, jbachorik, sspitsyn
 2014-09-25 02:48:25 -07:00
Aleksey Shipilev
f824f8c3cb 8058968: Compiler time traces should be improved 
Use CITime consistently, make C2 to report to CompilerBroker, more probes.

Reviewed-by: vlivanov, jrose
 2014-09-25 12:10:57 +04:00
Tobias Hartmann
d63b9025d8 8058737: CodeCache::find_blob fails with 'unsafe access to zombie method' 
Remove active ICStubs from zombie nmethods

Reviewed-by: kvn, iveresov
 2014-09-29 08:40:51 +02:00
Igor Veresov
bea6d40f48 8058536: java/lang/instrument/NativeMethodPrefixAgent.java fails due to VirtualMachineError: out of space in CodeCache for method handle intrinsic 
Make sure MH intrinsics can be created before compiler instances

Reviewed-by: kvn
 2014-09-26 20:09:02 -07:00
Volker Simonis
a1628426d3 8058345: Refactor native stack printing from vmError.cpp to debug.cpp to make it available in gdb as well 
Also fix stack trace on x86 to enable walking of runtime stubs and native wrappers

Reviewed-by: kvn
 2014-09-24 12:19:07 -07:00
Ioi Lam
4458c0663b Merge 2014-09-24 09:48:15 -07:00
Staffan Larsen
ade3cd1920 8058936: hotspot/test/Makefile should use jtreg script from $JT_HOME/bin/jreg (instead of $JT_HOME/win32/bin/jtreg) 
Reviewed-by: dholmes, stefank
 2014-09-24 09:49:47 +02:00
David Holmes
6892c04d57 8058919: Add sanity test for minimal VM in test/Makefile 
Reviewed-by: twisti, kvn, coleenp
 2014-09-23 21:33:58 -04:00
Igor Veresov
f85f7d2832 8059002: 8058744 needs a test case 
Added a test case the UnsafeRawOp intrinsics

Reviewed-by: kvn
 2014-09-23 17:24:34 -07:00
Igor Veresov
ce1c41a15b 8058744: Crash in C1 OSRed method w/ Unsafe usage 
Fix UnsafeRawOp optimizations

Reviewed-by: kvn, drchase, vlivanov
 2014-09-23 15:09:07 -07:00
Staffan Larsen
a899525147 Merge 2014-09-23 14:19:55 +02:00
Staffan Larsen
c0a173e10e Merge 2014-09-23 14:17:46 +02:00
Staffan Larsen
d80b467df1 8058448: Disable JPRT submissions from the hotspot repo 
Reviewed-by: kvn
 2014-09-23 12:17:24 +02:00
David Chase
f92d959195 8058827: XCode 6.0 (Clang) warning "operator new' should not return a null pointer unless..." 
Rewrote the null pointer in a way that is not recognized by the compiler (the code is never executed).

Reviewed-by: kvn
 2014-09-22 14:19:11 -04:00
Aleksey Shipilev
426f339847 8057925: PrintSymbolTableSizeHistogram prints misleading output 
Reviewed-by: jrose, kvn, gziemski
 2014-09-22 18:34:35 +04:00
Jesper Wilhelmsson
f9b921bd25 Merge 2014-09-22 16:22:21 +02:00
Mikael Gerdin
53b92fe072 8055141: Catch linker errors earlier in the JVM build by not allowing unresolved externals 
Reviewed-by: erikj, ehelin, dholmes
 2014-09-25 10:01:53 +02:00
Sangheon Kim
30cb2dcb12 8036116: Fix thread-id types in G1 remembered set implementations 
Reviewed-by: stefank, jprovino, brutisso
 2014-09-24 11:00:12 +02:00
Staffan Larsen
071bfa97d6 Merge 2014-09-23 14:18:55 +02:00
Stefan Karlsson
1a452ae3ae Merge 2014-09-23 12:52:57 +00:00
Joseph Provino
b0b5fa7bc6 8027450: Improve time reporting in G1 remark 
Reviewed-by: stefank, tschatzl
 2014-09-23 12:34:37 +02:00
Antonios Printezis
da5afa76ab 8058495: G1: normalize names for isHumongous() and friends 
Reviewed-by: tschatzl, brutisso
 2014-09-23 11:43:24 +02:00
Tobias Hartmann
b9eae7f74f 8058712: [TESTBUG] serviceability/dcmd/CodeCacheTest.java fails with java.lang.Exception 
The test is changed to check the output according to the number of available code segments.

Reviewed-by: kvn
 2014-09-21 16:13:39 +02:00
Coleen Phillimore
38190eccc4 8058843: TEST.groups has runtime/runtime/7158988/FieldMonitor.java 
Remove a runtime

Reviewed-by: ctornqvi, sspitsyn, kvn
 2014-09-19 21:13:25 -04:00
Ioi Lam
a2e41921c1 Merge 2014-09-19 13:47:19 -07:00
Niclas Adlertz
37c8ef911c Merge 2014-09-19 17:14:13 +02:00
Harold Seigel
1bae14de54 8057845: ClassVerifier::verify_exception_handler_targets reconstructs the ExceptionTable in a loop 
Construct the ExceptionTable only once, before the loop

Reviewed-by: acorn, jiangli, coleenp, lfoltan
 2014-09-19 08:19:04 -04:00
Nils Eliasson
17816444dc Merge 2014-09-19 10:24:10 +00:00
Alejandro Murillo
0122d75979 Merge 2014-09-19 01:59:59 -07:00
Nils Eliasson
53bec16184 8058479: serviceability/dcmd/CodeCacheTest.java fails 
Don't parse really large hex values into a long

Reviewed-by: kvn, anoll
 2014-09-19 10:31:03 +02:00
Lana Steuck
1c350e9d11 Merge 2014-09-18 13:28:15 -07:00
Niclas Adlertz
3ae1e0225a Merge 2014-09-18 18:40:37 +00:00
Jesper Wilhelmsson
e97944b0b1 Merge 2014-09-18 19:41:50 +02:00
Niclas Adlertz
0ef1f8fd6f Merge 2014-09-18 19:30:59 +02:00
Goetz Lindenmaier
c82c59cd8f 8058716: Add include missing in 8015774 
Reviewed-by: kvn
 2014-09-18 09:37:26 +02:00
Morris Meyer
c468032582 8050022: linux-sparcv9: assert(SharedSkipVerify || obj->is_oop()) failed: sanity check 
Provide promoted stack slots for floating-point registers in the SPARC c_calling_convention.

Reviewed-by: kvn, jrose, drchase
 2014-09-18 11:46:33 -07:00
Zoltan Majo
e39f822e38 8050407: Add jtreg compiler tests to Hotspot JPRT jobs 
Select useful jtreg test. Group tests into four sets (3 sets with open tests, 1 set with closed tests) so that execution time of each set is < 10 min on solaris_sparcv9 (slowest platform).

Reviewed-by: kvn, anoll, roland
 2014-09-18 12:23:20 +02:00
Roland Westrelin
37e154c233 Merge 2014-09-18 09:16:12 +00:00
Igor Veresov
ba6a457d68 Merge 2014-09-18 08:32:12 +00:00
Nils Eliasson
99a2ef6914 8058583: Remove CompilationRepeat 
Remove product flag -XX:CompilationRepeat

Reviewed-by: kvn, iveresov
 2014-09-18 08:47:07 +02:00
David Katleman
0c813c1b9e Added tag jdk9-b31 for changeset 8d0d35462d9b 2014-09-17 22:55:51 -07:00
Igor Veresov
ad7e67c98f 8058564: Tiered compilation performance drop in PIT 
Ensure MethodCounters are created before method is enqueued for compilation

Reviewed-by: kvn, drchase, jiangli
 2014-09-17 21:15:03 -07:00
Christian Tornqvist
4d8eb788f4 8058369: [TESTBUG] runtime/CompressedOops/UseCompressedOops.java Exception java.lang.RuntimeException: 'Zero based' missing from stdout/stderr 
Solaris and OSX places the heap in unpredictable places, some of the test must be excluded on these platforms

Reviewed-by: hseigel, coleenp
 2014-09-17 06:55:12 -07:00
Roland Westrelin
2ca3c40687 8058636: test case for 8057758 
Missing test case in push for 8057758

Reviewed-by: kvn, iveresov
 2014-09-17 14:56:12 +02:00
Tobias Hartmann
964c442938 Merge 2014-09-17 06:05:41 +00:00
Tobias Hartmann
cd01de591a 8015774: Add support for multiple code heaps 
Support for segmentation of the code cache. Separate code heaps are created and used to store code of different types.

Reviewed-by: kvn, iveresov, roland, anoll, egahlin, sla
 2014-09-17 08:00:07 +02:00
Boris Molodenkov
652c27e15d 8057165: [TESTBUG] Need a test to cover JDK-8054883 
Reviewed-by: kvn, iveresov, iignatyev
 2014-09-16 21:29:30 +04:00
Albert Noll
b2620f89c3 8058452: ciInstanceKlass::non_static_fields() can be removed 
CiInstanceKlass::non_static_fields() and all associated data structures can be removed since they are unused.

Reviewed-by: kvn, thartmann
 2014-09-16 14:39:11 +02:00
Magnus Ihse Bursie
2678b42e96 8056999: Make hotspot builds less verbose on default log level 
Reviewed-by: dholmes, erikj
 2014-09-16 12:13:13 +02:00
Stefan Karlsson
970f6603c1 Merge 2014-09-16 09:31:42 +00:00
Thomas Schatzl
adf66602a0 8052172: Evacuation failure handling in G1 does not evacuate all objects if -XX:-G1DeferredRSUpdate is set 
Remove -XX:-G1DeferredRSUpdate functionality as it is racy. During evacuation failure handling, threads where evacuation failure handling occurred may try to add remembered sets to regions which remembered sets are currently being scanned. The iterator to handle the remembered set scan does not support addition of entries during scan and so may skip valid references.

Reviewed-by: iveresov, brutisso, mgerdin
 2014-09-16 10:28:15 +02:00
Stefan Karlsson
cdc16edaa5 8058475: TestCMSClassUnloadingEnabledHWM.java fails with '.*CMS Initial Mark.*' missing from stdout/stderr 
Reviewed-by: mgerdin, tschatzl, brutisso
 2014-09-16 10:13:45 +02:00
George Triantafillou
d7f661e576 8058504: [TESTBUG] Temporarily disable failing test runtime/NMT/MallocTrackingVerify.java 
Reviewed-by: ctornqvi, hseigel
 2014-09-15 14:28:15 -07:00
Nils Eliasson
2dcb0e33bb 8058461: serviceability/dcmd/CodelistTest.java and serviceability/dcmd/CompilerQueueTest.java SIGSEGV 
Print only alive nmethods and add lock to print compile queue

Reviewed-by: kvn, anoll
 2014-09-15 17:12:01 +02:00
Tobias Hartmann
dd6285d984 8048721: -XX:+PrintCompilation prints negative bci for non entrant OSR methods 
Removed 'InvalidOSREntryBci' and checking nmethod::_state instead to determine if an osr method is non-entrant.

Reviewed-by: kvn, vlivanov, drchase
 2014-09-15 08:08:22 +02:00
Ioi Lam
9fe35127c2 Merge 2014-09-12 14:05:28 -07:00
Alejandro Murillo
f082ff287e Merge 2014-09-12 04:22:19 -07:00
Niclas Adlertz
d348978bc1 Merge 2014-09-12 09:17:58 +02:00
Christian Tornqvist
9e6d432562 8022865: [TESTBUG] Compressed Oops testing needs to be revised 
Rewrote compressed oops tests

Reviewed-by: kvn, coleenp, mseledtsov
 2014-09-11 17:54:22 -07:00
John Coomes
fada700e21 8058235: identify GCs initiated to update allocation context stats 
Reviewed-by: mikael, sjohanss
 2014-09-11 17:13:30 -07:00
Lana Steuck
890a1517be Merge 2014-09-11 14:28:30 -07:00
Bradford Wetmore
57a91cf7bd 8058180: .hgignore should be updated with webrev in all repos 
Reviewed-by: jrose, katleman, jjg
 2014-09-11 12:18:02 -07:00
David Katleman
b45a0b373e Added tag jdk9-b30 for changeset 9628dff9b9a1 2014-09-11 09:08:47 -07:00
Coleen Phillimore
310192415e 8055145: [TESTBUG] runtime/7158988/FieldMonitor.java fails with VMDisconnectedException 
Exclude this test on JPRT and make it trivially pass if it gets a disconnected exception (which seems rare)

Reviewed-by: gtriantafill, sspitsyn, ctornqvi
 2014-09-11 10:46:32 -04:00
Tom Rodriguez
98b5d14523 8054174: minor buglet in computation of end of pc descs in libjvm_db.c 
Fixed scopes_pcs_end calculation

Reviewed-by: sspitsyn, sla
 2014-09-11 03:13:29 -07:00
Nils Eliasson
1ba87d2a18 Merge 2014-09-11 08:01:15 +00:00
Igor Veresov
6dc6f53f6a 8058184: Move _highest_comp_level and _highest_osr_comp_level from MethodData to MethodCounters 
Tiered policy requires highest compilation levels always available

Reviewed-by: kvn, vlivanov
 2014-09-11 00:04:50 -07:00
Lana Steuck
47add31262 Merge 2014-09-10 19:36:46 -07:00
Igor Veresov
7275456c3a 8058092: Test vm/mlvm/meth/stress/compiler/deoptimize. Assert in src/share/vm/classfile/systemDictionary.cpp: MH intrinsic invariant 
Throw exception if unable to compile an MH intrinsic

Reviewed-by: kvn
 2014-09-10 19:08:17 -07:00
Daniel D. Daugherty
e7bc11f7b1 Merge 2014-09-10 17:06:36 -07:00
Jon Masamitsu
25727c12c2 Merge 2014-09-10 23:14:13 +00:00
Daniel D. Daugherty
5e63b8cfc4 8057109: manual cleanup of white space issues prior to Contended Locking reorder and cache line bucket 
Reviewed-by: fparain, sspitsyn, coleenp
 2014-09-10 11:52:16 -06:00
Daniel D. Daugherty
e1a36d62a0 8057107: cleanup indent white space issues prior to Contended Locking reorder and cache line bucket 
Reviewed-by: fparain, sspitsyn, coleenp
 2014-09-10 11:48:20 -06:00
Ivan Gerasimov
497f5c44a6 8057744: (process) Synchronize exiting of threads and process [win] 
Reviewed-by: dholmes, dcubed, sla
 2014-09-10 09:52:41 -07:00
Christian Tornqvist
3ad47cdbeb 8055719: Clean out support for old VC versions from ProjectCreator 
Clean out support for old VC versions from ProjectCreator

Reviewed-by: sla, allwin
 2014-09-10 07:06:37 -07:00
Nils Eliasson
6062c2db15 8054889: Compiler team's implementation task 
Adding three new diagnostic commands for compiler

Reviewed-by: anoll, kvn, drchase
 2014-09-10 13:27:33 +02:00
David Holmes
eb8950df45 8056183: os::is_MP() always reports true when NMT is enabled 
Reviewed-by: shade, coleenp, bdelsart
 2014-09-10 00:44:16 -04:00
Roland Westrelin
2d59d215e2 8057758: Tests run TypeProfileLevel=222 crash with guarantee(0) failed: must find derived/base pair 
Use TypeAryPtr::INT type with offset 0 in inline_multiplyToLen().

Reviewed-by: kvn, iveresov
 2014-09-09 15:47:18 -07:00
Yumin Qi
425a00d039 Merge 2014-09-09 18:56:24 +00:00
George Triantafillou
287db624e4 8054836: [TESTBUG] Test is needed to verify correctness of malloc tracking 
Reviewed-by: ctornqvi, lfoltan
 2014-09-09 09:48:42 -07:00
Niclas Adlertz
1b124f9f48 Merge 2014-09-09 16:14:40 +02:00
Yumin Qi
9b0811172b 8056930: Output host info under some condition for core dump 
Output host name after java crashed for debug version.

Reviewed-by: dholmes, ccheung
 2014-09-08 22:48:09 -07:00
Ivan Gerasimov
b5c0f09885 8057745: TEST_BUG: runtime/SharedArchiveFile/ArchiveDoesNotExist.java fails with openjdk build 
Reviewed-by: dholmes, mseledtsov
 2014-09-08 23:49:39 +04:00
Mikael Gerdin
7bf45791e8 8057722: G1: Code root hashtable updated incorrectly when evacuation failed 
Reviewed-by: brutisso, jwilhelm
 2014-09-08 17:47:43 +02:00
Stefan Karlsson
1e20d1e9f1 8057918: Update out-dated ignore tags in GC jtreg tests 
Reviewed-by: ehelin, tschatzl
 2014-09-09 13:55:38 +02:00
Bengt Rutisson
c9d4b7a93c 8057910: G1: BOT verification should not pass top 
Reviewed-by: stefank, tschatzl
 2014-09-09 14:27:10 +02:00
Severin Gehwolf
4d6624b430 8057696: java -version triggers assertion for slowdebug zero builds 
The change as introduced with JDK-8003426 removed some zero code in cppInterpreter_zero.cpp which called generate_normal_entry() in that same file with a value of synchronized == false unconditionally. However, since the new code calls generate_normal_entry() with either true or false, the assertion in this method is no longer valid.

Reviewed-by: coleenp
 2014-09-08 11:14:41 -04:00
Volker Simonis
cf7dd2e6e4 8057780: Fix ppc build after "8050147: StoreLoad barrier interferes with stack usages 
Reviewed-by: kvn, shade
 2014-09-08 16:05:48 +02:00
Igor Veresov
b91254ea6a 8057750: CTW should not make MH intrinsics not entrant 
Do not make MH intrinsics not entrant in CTW

Reviewed-by: kvn, vlivanov
 2014-09-08 11:45:48 -07:00
Stefan Johansson
174af2ea34 8057752: WhiteBox extension support for testing 
Refactored parts of whitebox.cpp to enable registration of whitebox methods defined outside this file.

Reviewed-by: mikael, ctornqvi, jmasa
 2014-09-08 15:24:10 +02:00
John Coomes
d50a563314 8057827: notify an obj when allocation context stats are available 
Reviewed-by: mikael, jmasa, tschatzl
 2014-09-10 16:06:53 -07:00
John Coomes
fd0e5093ca 8057824: methods to copy allocation context statistics 
Reviewed-by: mikael, jmasa, tschatzl
 2014-09-10 13:01:13 -07:00
John Coomes
40155ae18d 8057818: collect allocation context statistics at gc pauses 
Reviewed-by: mikael, jmasa
 2014-09-10 13:01:13 -07:00
Stefan Johansson
0856ec5961 8057710: Refactor G1 heap region default sizes 
Refactored the defines to instead be static const in a HeapRegionBounds class.

Reviewed-by: mgerdin, tschatzl
 2014-09-09 04:48:41 +02:00
Stefan Johansson
3e6d46d28b 8057658: Enable G1 FullGC extensions 
Refactored the G1 FullGC code to enable it to be extended.

Reviewed-by: mgerdin, brutisso
 2014-09-09 00:05:25 +02:00
Bengt Rutisson
ff1498ba6b 8025564: gc/memory/UniThread/Linear1 times out during heap verification 
Reviewed-by: stefank, tschatzl
 2014-09-08 10:41:06 +02:00
Igor Veresov
e285f3eadc 8056154: JVM crash with EXCEPTION_ACCESS_VIOLATION when there are many threads running 
Don't make compiled MH intrinsics not entrant when redefining classes

Reviewed-by: kvn, vlivanov
 2014-09-05 14:39:45 -07:00
John Coomes
938374d5f9 8057623: add an extension class for argument handling 
Reviewed-by: brutisso, mgerdin, tschatzl
 2014-09-05 12:36:37 -07:00
Igor Veresov
5db7b3a4e1 8056124: Hotspot should use PICL interface to get cacheline size on SPARC 
Using libpicl to get L1 data and L2 cache line sizes

Reviewed-by: kvn, roland, morris
 2014-09-05 11:23:47 -07:00
Zoltan Majo
35bca0df61 8053886: assert(false) failed: Should not allocate with exception pending 
Failure caused by allocating method counters. Changed the way counters are allocated (use get_method_counters() instead of build_method_counters())

Reviewed-by: kvn, thartmann, anoll
 2014-09-05 16:07:22 +02:00
Stefan Johansson
f8137659f5 8057536: Refactor G1 to allow context specific allocations 
Splitting out a g1 allocator class to simply specialized allocators which can associate each allocation with a given context.

Reviewed-by: mgerdin, brutisso
 2014-09-05 09:49:19 +02:00
Vladimir Kozlov
f8eeba1ce4 8057643: Unable to build --with-debug-level=optimized on OSX 
Added missing Hotspot make targets for 'optimized' build.

Reviewed-by: iveresov
 2014-09-04 23:49:17 -07:00
Vladimir Kozlov
98f413fa1f Merge 2014-09-04 22:59:17 -07:00
John Coomes
100e58569c 8057531: refactor gc argument processing code slightly 
Reviewed-by: mgerdin, tschatzl, jmasa
 2014-09-04 16:53:27 -07:00
Lana Steuck
100e3aba7b Merge 2014-09-04 14:45:08 -07:00
Jon Masamitsu
f93cc0e163 Merge 2014-09-04 13:45:39 -07:00