comparison src/share/vm/interpreter/linkResolver.cpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents f16e75e0cf11
children 11d5942ef9c7
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
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.
1239 } 1239 }
1240 1240
1241 1241
1242 void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) { 1242 void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) {
1243 assert(EnableInvokeDynamic, ""); 1243 assert(EnableInvokeDynamic, "");
1244 pool->set_invokedynamic(); // mark header to flag active call sites
1245 1244
1246 //resolve_pool(<resolved_klass>, method_name, method_signature, current_klass, pool, index, CHECK); 1245 //resolve_pool(<resolved_klass>, method_name, method_signature, current_klass, pool, index, CHECK);
1247 Symbol* method_name = pool->name_ref_at(index); 1246 Symbol* method_name = pool->name_ref_at(index);
1248 Symbol* method_signature = pool->signature_ref_at(index); 1247 Symbol* method_signature = pool->signature_ref_at(index);
1249 KlassHandle current_klass = KlassHandle(THREAD, pool->pool_holder()); 1248 KlassHandle current_klass = KlassHandle(THREAD, pool->pool_holder());