Mercurial > hg > graal-jvmci-8
diff src/share/vm/oops/instanceOop.hpp @ 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 | 8e47bac5643a |
| children | 7944aba7ba41 |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceOop.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/oops/instanceOop.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, 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 @@ -37,7 +37,9 @@ // If compressed, the offset of the fields of the instance may not be aligned. static int base_offset_in_bytes() { - return UseCompressedOops ? + // offset computation code breaks if UseCompressedKlassPointers + // only is true + return (UseCompressedOops && UseCompressedKlassPointers) ? klass_gap_offset_in_bytes() : sizeof(instanceOopDesc); }