OpenJDK / portola / portola
changeset 28221:000bc11b1078
Merge
| author | kvn |
|---|---|
| date | Tue, 23 Dec 2014 16:42:48 -0800 |
| parents | 84ded0ce573d 6be786c17d01 |
| children | b1b945e3c9b1 df9e4ec74c72 |
| files | hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp |
| diffstat | 3 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Tue Dec 23 14:03:15 2014 +0100 +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Tue Dec 23 16:42:48 2014 -0800 @@ -42,6 +42,7 @@ #include "gc_implementation/shared/isGCActiveMark.hpp" #include "gc_interface/collectedHeap.inline.hpp" #include "memory/allocation.hpp" +#include "memory/cardGeneration.inline.hpp" #include "memory/cardTableRS.hpp" #include "memory/collectorPolicy.hpp" #include "memory/gcLocker.inline.hpp"
--- a/hotspot/src/share/vm/memory/tenuredGeneration.cpp Tue Dec 23 14:03:15 2014 +0100 +++ b/hotspot/src/share/vm/memory/tenuredGeneration.cpp Tue Dec 23 16:42:48 2014 -0800 @@ -28,6 +28,7 @@ #include "gc_implementation/shared/parGCAllocBuffer.hpp" #include "memory/allocation.inline.hpp" #include "memory/blockOffsetTable.inline.hpp" +#include "memory/cardGeneration.inline.hpp" #include "memory/generationSpec.hpp" #include "memory/genMarkSweep.hpp" #include "memory/genOopClosures.inline.hpp"
--- a/hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java Tue Dec 23 14:03:15 2014 +0100 +++ b/hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java Tue Dec 23 16:42:48 2014 -0800 @@ -330,7 +330,7 @@ } catch (RuntimeException e) { // Check if tiered compilation is available in this JVM // Version. Throw exception only if it is available. - if (!(tiered && out.getOutput().contains("Client VM warning: TieredCompilation is disabled in this release."))) { + if (!(tiered && out.getOutput().contains("TieredCompilation is disabled in this release."))) { throw new RuntimeException(e); } }