Mercurial > hg > truffle
diff src/share/vm/memory/freeList.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Wed, 15 Oct 2014 16:02:50 +0200 |
| parents | 89152779163c 191174b49bec |
| children | 7848fc12602b |
line wrap: on
line diff
--- a/src/share/vm/memory/freeList.cpp Thu Oct 16 10:21:29 2014 +0200 +++ b/src/share/vm/memory/freeList.cpp Wed Oct 15 16:02:50 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ #if INCLUDE_ALL_GCS #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" +#include "gc_implementation/g1/g1CodeCacheRemSet.hpp" #endif // INCLUDE_ALL_GCS // Free list. A FreeList is used to access a linked list of chunks @@ -332,4 +333,5 @@ template class FreeList<Metachunk>; #if INCLUDE_ALL_GCS template class FreeList<FreeChunk>; +template class FreeList<G1CodeRootChunk>; #endif // INCLUDE_ALL_GCS