Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorstefank
Fri, 20 Feb 2015 17:08:48 +0000
changeset 29206 b16546c98e0a
parent 29203 5024f7b3322c (current diff)
parent 29205 c2fa06b633b3 (diff)
child 29207 c5b52635f690
Merge
--- a/hotspot/src/share/vm/code/codeCache.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/code/codeCache.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -31,7 +31,6 @@
 #include "code/nmethod.hpp"
 #include "code/pcDesc.hpp"
 #include "compiler/compileBroker.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/gcLocker.hpp"
 #include "memory/iterator.hpp"
--- a/hotspot/src/share/vm/oops/cpCache.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/oops/cpCache.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/rewriter.hpp"
 #include "memory/universe.inline.hpp"
--- a/hotspot/src/share/vm/oops/klassVtable.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
 #include "memory/gcLocker.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.inline.hpp"
--- a/hotspot/src/share/vm/precompiled/precompiled.hpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/precompiled/precompiled.hpp	Fri Feb 20 17:08:48 2015 +0000
@@ -90,8 +90,6 @@
 # include "gc_implementation/shared/gcUtil.hpp"
 # include "gc_implementation/shared/generationCounters.hpp"
 # include "gc_implementation/shared/immutableSpace.hpp"
-# include "gc_implementation/shared/markSweep.hpp"
-# include "gc_implementation/shared/markSweep.inline.hpp"
 # include "gc_implementation/shared/mutableSpace.hpp"
 # include "gc_implementation/shared/spaceCounters.hpp"
 # include "gc_implementation/shared/spaceDecorator.hpp"
--- a/hotspot/src/share/vm/runtime/interfaceSupport.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "gc_interface/collectedHeap.hpp"
 #include "gc_interface/collectedHeap.inline.hpp"
 #include "memory/genCollectedHeap.hpp"
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -46,7 +46,6 @@
 #include "compiler/oopMap.hpp"
 #include "compiler/compileBroker.hpp"
 #include "gc_implementation/shared/immutableSpace.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "gc_implementation/shared/mutableSpace.hpp"
 #include "gc_interface/collectedHeap.hpp"
 #include "interpreter/bytecodeInterpreter.hpp"
--- a/hotspot/src/share/vm/utilities/debug.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/utilities/debug.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -30,7 +30,6 @@
 #include "code/vtableStubs.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/disassembler.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "gc_interface/collectedHeap.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
jdk-sandbox