Mercurial > hg > truffle
diff src/share/vm/classfile/classLoaderData.inline.hpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | 1cb4795305b9 |
children | de6a9e811145 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classLoaderData.inline.hpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/classfile/classLoaderData.inline.hpp Wed Jun 19 10:45:56 2013 +0200 @@ -43,10 +43,9 @@ assert(loader() != NULL,"Must be a class loader"); // Gets the class loader data out of the java/lang/ClassLoader object, if non-null // it's already in the loader_data, so no need to add - ClassLoaderData** loader_data_addr = java_lang_ClassLoader::loader_data_addr(loader()); - ClassLoaderData* loader_data_id = *loader_data_addr; - if (loader_data_id) { - return loader_data_id; + ClassLoaderData* loader_data= java_lang_ClassLoader::loader_data(loader()); + if (loader_data) { + return loader_data; } - return ClassLoaderDataGraph::add(loader_data_addr, loader, THREAD); + return ClassLoaderDataGraph::add(loader, false, THREAD); }