Mercurial > hg > graal-jvmci-8
diff src/share/vm/classfile/classLoader.cpp @ 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 | 2cb439954abf 90273fc0a981 |
| children | 8d10fc6b4f6c |
line wrap: on
line diff
--- a/src/share/vm/classfile/classLoader.cpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/share/vm/classfile/classLoader.cpp Fri Dec 14 14:35:13 2012 +0100 @@ -26,6 +26,7 @@ #include "classfile/classFileParser.hpp" #include "classfile/classFileStream.hpp" #include "classfile/classLoader.hpp" +#include "classfile/classLoaderData.inline.hpp" #include "classfile/javaClasses.hpp" #include "classfile/systemDictionary.hpp" #include "classfile/vmSymbols.hpp" @@ -939,11 +940,11 @@ // class file found, parse it ClassFileParser parser(stream); - Handle class_loader; + ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data(); Handle protection_domain; TempNewSymbol parsed_name = NULL; instanceKlassHandle result = parser.parseClassFile(h_name, - class_loader, + loader_data, protection_domain, parsed_name, false,