Mercurial > hg > graal-compiler

comparison src/share/vm/classfile/classLoader.cpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2cb439954abf 90273fc0a981
children 8d10fc6b4f6c
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "classfile/classFileParser.hpp" 26 #include "classfile/classFileParser.hpp"
27 #include "classfile/classFileStream.hpp" 27 #include "classfile/classFileStream.hpp"
28 #include "classfile/classLoader.hpp" 28 #include "classfile/classLoader.hpp"
29 #include "classfile/classLoaderData.inline.hpp"
29 #include "classfile/javaClasses.hpp" 30 #include "classfile/javaClasses.hpp"
30 #include "classfile/systemDictionary.hpp" 31 #include "classfile/systemDictionary.hpp"
31 #include "classfile/vmSymbols.hpp" 32 #include "classfile/vmSymbols.hpp"
32 #include "compiler/compileBroker.hpp" 33 #include "compiler/compileBroker.hpp"
33 #include "gc_interface/collectedHeap.inline.hpp" 34 #include "gc_interface/collectedHeap.inline.hpp"
937 instanceKlassHandle h; 938 instanceKlassHandle h;
938 if (stream != NULL) { 939 if (stream != NULL) {
939 940
940 // class file found, parse it 941 // class file found, parse it
941 ClassFileParser parser(stream); 942 ClassFileParser parser(stream);
942 Handle class_loader; 943 ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
943 Handle protection_domain; 944 Handle protection_domain;
944 TempNewSymbol parsed_name = NULL; 945 TempNewSymbol parsed_name = NULL;
945 instanceKlassHandle result = parser.parseClassFile(h_name, 946 instanceKlassHandle result = parser.parseClassFile(h_name,
946 class_loader, 947 loader_data,
947 protection_domain, 948 protection_domain,
948 parsed_name, 949 parsed_name,
949 false, 950 false,
950 CHECK_(h)); 951 CHECK_(h));
951 952