comparison src/share/vm/runtime/javaCalls.cpp @ 5743:fc7177e457bf

Merge
author henryjen
date Mon, 11 Nov 2013 23:16:56 -0800
parents f34d701e952e
children
comparison
equal deleted inserted replaced
18:143ab332e8a0 19:a4c74685dd89
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.
428 intptr_t* JavaCallArguments::parameters() { 428 intptr_t* JavaCallArguments::parameters() {
429 // First convert all handles to oops 429 // First convert all handles to oops
430 for(int i = 0; i < _size; i++) { 430 for(int i = 0; i < _size; i++) {
431 if (_is_oop[i]) { 431 if (_is_oop[i]) {
432 // Handle conversion 432 // Handle conversion
433 _value[i] = (intptr_t)Handle::raw_resolve((oop *)_value[i]); 433 _value[i] = cast_from_oop<intptr_t>(Handle::raw_resolve((oop *)_value[i]));
434 } 434 }
435 } 435 }
436 // Return argument vector 436 // Return argument vector
437 return _value; 437 return _value;
438 } 438 }