Mercurial > hg > truffle

diff src/share/vm/oops/instanceMirrorKlass.hpp @ 12873:4e7f99b70d9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author adlertz
date Wed, 09 Oct 2013 05:03:34 -0700
parents 190899198332
children
line wrap: on
line diff
--- a/src/share/vm/oops/instanceMirrorKlass.hpp	Wed Oct 09 13:00:20 2013 +0200
+++ b/src/share/vm/oops/instanceMirrorKlass.hpp	Wed Oct 09 05:03:34 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -66,7 +66,7 @@
   // Static field offset is an offset into the Heap, should be converted by
   // based on UseCompressedOop for traversal
   static HeapWord* start_of_static_fields(oop obj) {
-    return (HeapWord*)((intptr_t)obj + offset_of_static_fields());
+    return (HeapWord*)(cast_from_oop<intptr_t>(obj) + offset_of_static_fields());
   }
 
   static void init_offset_of_static_fields() {