equal
deleted
inserted
replaced
272 StackValueCollection* result = new StackValueCollection(length); |
272 StackValueCollection* result = new StackValueCollection(length); |
273 |
273 |
274 // Get oopmap describing oops and int for current bci |
274 // Get oopmap describing oops and int for current bci |
275 InterpreterOopMap oop_mask; |
275 InterpreterOopMap oop_mask; |
276 if (TraceDeoptimization && Verbose) { |
276 if (TraceDeoptimization && Verbose) { |
277 methodHandle m_h(thread(), method()); |
277 // need the current JavaThread and not thread() |
|
278 methodHandle m_h(Thread::current(), method()); |
278 OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask); |
279 OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask); |
279 } else { |
280 } else { |
280 method()->mask_for(bci(), &oop_mask); |
281 method()->mask_for(bci(), &oop_mask); |
281 } |
282 } |
282 // handle locals |
283 // handle locals |
333 InterpreterOopMap oop_mask; |
334 InterpreterOopMap oop_mask; |
334 |
335 |
335 if (!method()->is_native()) { |
336 if (!method()->is_native()) { |
336 // Get oopmap describing oops and int for current bci |
337 // Get oopmap describing oops and int for current bci |
337 if (TraceDeoptimization && Verbose) { |
338 if (TraceDeoptimization && Verbose) { |
338 methodHandle m_h(method()); |
339 // need the current JavaThread and not thread() |
|
340 methodHandle m_h(Thread::current(), method()); |
339 OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask); |
341 OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask); |
340 } else { |
342 } else { |
341 method()->mask_for(bci(), &oop_mask); |
343 method()->mask_for(bci(), &oop_mask); |
342 } |
344 } |
343 } |
345 } |