comparison src/share/vm/classfile/classFileParser.hpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 90273fc0a981
children 35431a769282
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
361 // The system dictionary hookup is done by the caller. 361 // The system dictionary hookup is done by the caller.
362 // 362 //
363 // "parsed_name" is updated by this method, and is the name found 363 // "parsed_name" is updated by this method, and is the name found
364 // while parsing the stream. 364 // while parsing the stream.
365 instanceKlassHandle parseClassFile(Symbol* name, 365 instanceKlassHandle parseClassFile(Symbol* name,
366 Handle class_loader, 366 ClassLoaderData* loader_data,
367 Handle protection_domain, 367 Handle protection_domain,
368 TempNewSymbol& parsed_name, 368 TempNewSymbol& parsed_name,
369 bool verify, 369 bool verify,
370 TRAPS) { 370 TRAPS) {
371 KlassHandle no_host_klass; 371 KlassHandle no_host_klass;
372 return parseClassFile(name, class_loader, protection_domain, no_host_klass, NULL, parsed_name, verify, THREAD); 372 return parseClassFile(name, loader_data, protection_domain, no_host_klass, NULL, parsed_name, verify, THREAD);
373 } 373 }
374 instanceKlassHandle parseClassFile(Symbol* name, 374 instanceKlassHandle parseClassFile(Symbol* name,
375 Handle class_loader, 375 ClassLoaderData* loader_data,
376 Handle protection_domain, 376 Handle protection_domain,
377 KlassHandle host_klass, 377 KlassHandle host_klass,
378 GrowableArray<Handle>* cp_patches, 378 GrowableArray<Handle>* cp_patches,
379 TempNewSymbol& parsed_name, 379 TempNewSymbol& parsed_name,
380 bool verify, 380 bool verify,