Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 6646:c38f13903fdf
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ just before the NPG (no perm gen) changeset
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 29 Oct 2012 21:10:04 +0100 |
parents | d56d600819fe bb3f6194fedb |
children | e522a00b91aa 8c5333c80cfd |
comparison
equal
deleted
inserted
replaced
6590:dc5eec61daba | 6646:c38f13903fdf |
---|---|
1932 // Note: only executed in non-PRODUCT mode | 1932 // Note: only executed in non-PRODUCT mode |
1933 if (!UseAsyncConcMarkSweepGC && | 1933 if (!UseAsyncConcMarkSweepGC && |
1934 (ExplicitGCInvokesConcurrent || | 1934 (ExplicitGCInvokesConcurrent || |
1935 ExplicitGCInvokesConcurrentAndUnloadsClasses)) { | 1935 ExplicitGCInvokesConcurrentAndUnloadsClasses)) { |
1936 jio_fprintf(defaultStream::error_stream(), | 1936 jio_fprintf(defaultStream::error_stream(), |
1937 "error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts" | 1937 "error: +ExplicitGCInvokesConcurrent[AndUnloadsClasses] conflicts" |
1938 " with -UseAsyncConcMarkSweepGC"); | 1938 " with -UseAsyncConcMarkSweepGC"); |
1939 status = false; | 1939 status = false; |
1940 } | 1940 } |
1941 | 1941 |
1942 status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk"); | 1942 status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk"); |