Mercurial > hg > graal-jvmci-8
comparison src/share/vm/code/compiledIC.cpp @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | 760213a60e8b e9ff18c4ace7 |
children | 06f017f7daa7 |
comparison
equal
deleted
inserted
replaced
1484:6b7001391c97 | 1930:2d26b0046e0d |
---|---|
1 /* | 1 /* |
2 * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. | 2 * Copyright (c) 1997, 2010, 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. |
14 * | 14 * |
15 * You should have received a copy of the GNU General Public License version | 15 * You should have received a copy of the GNU General Public License version |
16 * 2 along with this work; if not, write to the Free Software Foundation, | 16 * 2 along with this work; if not, write to the Free Software Foundation, |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
18 * | 18 * |
19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 * CA 95054 USA or visit www.sun.com if you need additional information or | 20 * or visit www.oracle.com if you need additional information or have any |
21 * have any questions. | 21 * questions. |
22 * | 22 * |
23 */ | 23 */ |
24 | 24 |
25 #include "incls/_precompiled.incl" | 25 #include "incls/_precompiled.incl" |
26 #include "incls/_compiledIC.cpp.incl" | 26 #include "incls/_compiledIC.cpp.incl" |
439 } | 439 } |
440 } | 440 } |
441 } | 441 } |
442 | 442 |
443 | 443 |
444 inline static RelocIterator parse_ic(CodeBlob* code, address ic_call, oop* &_oop_addr, bool *is_optimized) { | 444 inline static RelocIterator parse_ic(nmethod* nm, address ic_call, oop* &_oop_addr, bool *is_optimized) { |
445 address first_oop = NULL; | 445 address first_oop = NULL; |
446 // Mergers please note: Sun SC5.x CC insists on an lvalue for a reference parameter. | 446 // Mergers please note: Sun SC5.x CC insists on an lvalue for a reference parameter. |
447 CodeBlob *code1 = code; | 447 nmethod* tmp_nm = nm; |
448 return virtual_call_Relocation::parse_ic(code1, ic_call, first_oop, _oop_addr, is_optimized); | 448 return virtual_call_Relocation::parse_ic(tmp_nm, ic_call, first_oop, _oop_addr, is_optimized); |
449 } | 449 } |
450 | 450 |
451 CompiledIC::CompiledIC(NativeCall* ic_call) | 451 CompiledIC::CompiledIC(NativeCall* ic_call) |
452 : _ic_call(ic_call), | 452 : _ic_call(ic_call), |
453 _oops(parse_ic(NULL, ic_call->instruction_address(), _oop_addr, &_is_optimized)) | 453 _oops(parse_ic(NULL, ic_call->instruction_address(), _oop_addr, &_is_optimized)) |