1.1 --- a/src/share/vm/oops/instanceMirrorKlass.hpp Wed Sep 25 17:47:51 2013 +0200
1.2 +++ b/src/share/vm/oops/instanceMirrorKlass.hpp Thu Sep 26 10:25:02 2013 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -66,7 +66,7 @@
1.11 // Static field offset is an offset into the Heap, should be converted by
1.12 // based on UseCompressedOop for traversal
1.13 static HeapWord* start_of_static_fields(oop obj) {
1.14 - return (HeapWord*)((intptr_t)obj + offset_of_static_fields());
1.15 + return (HeapWord*)(cast_from_oop<intptr_t>(obj) + offset_of_static_fields());
1.16 }
1.17
1.18 static void init_offset_of_static_fields() {
