Mercurial > hg > truffle
comparison src/share/vm/classfile/classLoaderData.cpp @ 7431:c52660592f37
Merge
author | roland |
---|---|
date | Fri, 21 Dec 2012 01:39:34 -0800 |
parents | 30866cd626b0 1b1e16471e46 |
children | e51c9860cf66 |
comparison
equal
deleted
inserted
replaced
7414:594b9b2119ed | 7431:c52660592f37 |
---|---|
167 return; | 167 return; |
168 } | 168 } |
169 ok = (objArrayOop)ok->obj_at(1); | 169 ok = (objArrayOop)ok->obj_at(1); |
170 } | 170 } |
171 | 171 |
172 // Must handle over GC points | |
173 assert (last != NULL, "dependencies should be initialized"); | |
174 objArrayHandle last_handle(THREAD, last); | |
175 | |
172 // Create a new dependency node with fields for (class_loader or mirror, next) | 176 // Create a new dependency node with fields for (class_loader or mirror, next) |
173 objArrayOop deps = oopFactory::new_objectArray(2, CHECK); | 177 objArrayOop deps = oopFactory::new_objectArray(2, CHECK); |
174 deps->obj_at_put(0, dependency()); | 178 deps->obj_at_put(0, dependency()); |
175 | 179 |
176 // Must handle over more GC points | 180 // Must handle over GC points |
177 objArrayHandle new_dependency(THREAD, deps); | 181 objArrayHandle new_dependency(THREAD, deps); |
178 | 182 |
179 // Add the dependency under lock | 183 // Add the dependency under lock |
180 assert (last != NULL, "dependencies should be initialized"); | |
181 objArrayHandle last_handle(THREAD, last); | |
182 locked_add_dependency(last_handle, new_dependency); | 184 locked_add_dependency(last_handle, new_dependency); |
183 } | 185 } |
184 | 186 |
185 void ClassLoaderData::locked_add_dependency(objArrayHandle last_handle, | 187 void ClassLoaderData::locked_add_dependency(objArrayHandle last_handle, |
186 objArrayHandle new_dependency) { | 188 objArrayHandle new_dependency) { |