Mercurial > hg > truffle
comparison src/share/vm/runtime/javaCalls.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | f94bb5d20e5d 190899198332 |
children | d8041d695d19 |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2013, 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. |
459 intptr_t* JavaCallArguments::parameters() { | 459 intptr_t* JavaCallArguments::parameters() { |
460 // First convert all handles to oops | 460 // First convert all handles to oops |
461 for(int i = 0; i < _size; i++) { | 461 for(int i = 0; i < _size; i++) { |
462 if (_is_oop[i]) { | 462 if (_is_oop[i]) { |
463 // Handle conversion | 463 // Handle conversion |
464 _value[i] = (intptr_t)Handle::raw_resolve((oop *)_value[i]); | 464 _value[i] = cast_from_oop<intptr_t>(Handle::raw_resolve((oop *)_value[i])); |
465 } | 465 } |
466 } | 466 } |
467 // Return argument vector | 467 // Return argument vector |
468 return _value; | 468 return _value; |
469 } | 469 } |