Mercurial > hg > truffle

comparison src/share/vm/oops/oop.inline.hpp @ 17937:78bbf4d43a14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8037816: Fix for 8036122 breaks build with Xcode5/clang 8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas 8043164: Format warning in traceStream.hpp Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings Reviewed-by: kvn, coleenp, iveresov, twisti
author drchase
date Thu, 22 May 2014 15:52:41 -0400
parents 3205e78d8193
children 52b4284cb496 ce8f6bb717c9
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, 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.
207 inline oop oopDesc::decode_heap_oop_not_null(narrowOop v) { 207 inline oop oopDesc::decode_heap_oop_not_null(narrowOop v) {
208 assert(!is_null(v), "narrow oop value can never be zero"); 208 assert(!is_null(v), "narrow oop value can never be zero");
209 address base = Universe::narrow_oop_base(); 209 address base = Universe::narrow_oop_base();
210 int shift = Universe::narrow_oop_shift(); 210 int shift = Universe::narrow_oop_shift();
211 oop result = (oop)(void*)((uintptr_t)base + ((uintptr_t)v << shift)); 211 oop result = (oop)(void*)((uintptr_t)base + ((uintptr_t)v << shift));
212 assert(check_obj_alignment(result), err_msg("address not aligned: " PTR_FORMAT, (void*) result)); 212 assert(check_obj_alignment(result), err_msg("address not aligned: " INTPTR_FORMAT, p2i((void*) result)));
213 return result; 213 return result;
214 } 214 }
215 215
216 inline oop oopDesc::decode_heap_oop(narrowOop v) { 216 inline oop oopDesc::decode_heap_oop(narrowOop v) {
217 return is_null(v) ? (oop)NULL : decode_heap_oop_not_null(v); 217 return is_null(v) ? (oop)NULL : decode_heap_oop_not_null(v);