Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | da91efe96a93 |
children | 746b070f5022 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
138 if (*block != clean_block) { | 138 if (*block != clean_block) { |
139 return true; | 139 return true; |
140 } | 140 } |
141 } | 141 } |
142 // No object starts in this slice; verify this using | 142 // No object starts in this slice; verify this using |
143 // more traditional methods: | 143 // more traditional methods: Note that no object can |
144 assert(object_start(end_addr - 1) <= start_addr, | 144 // start before the start_addr. |
145 assert(end_addr == start_addr || | |
146 object_start(end_addr - 1) <= start_addr, | |
145 "Oops an object does start in this slice?"); | 147 "Oops an object does start in this slice?"); |
146 return false; | 148 return false; |
147 } | 149 } |