Mercurial > hg > truffle

comparison src/share/vm/prims/jvmtiEnvThreadState.cpp @ 14521:29ccc4cbabca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents 3bee68af0296
children 0d8d78c0329a 4ca6dc0799b6 78bbf4d43a14
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
1 /* 1 /*
2 * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
270 ResourceMark rmark; // _thread != Thread::current() 270 ResourceMark rmark; // _thread != Thread::current()
271 RegisterMap rm(_thread, false); 271 RegisterMap rm(_thread, false);
272 // There can be a race condition between a VM_Operation reaching a safepoint 272 // There can be a race condition between a VM_Operation reaching a safepoint
273 // and the target thread exiting from Java execution. 273 // and the target thread exiting from Java execution.
274 // We must recheck the last Java frame still exists. 274 // We must recheck the last Java frame still exists.
275 if (_thread->has_last_Java_frame()) { 275 if (!_thread->is_exiting() && _thread->has_last_Java_frame()) {
276 javaVFrame* vf = _thread->last_java_vframe(&rm); 276 javaVFrame* vf = _thread->last_java_vframe(&rm);
277 assert(vf != NULL, "must have last java frame"); 277 assert(vf != NULL, "must have last java frame");
278 Method* method = vf->method(); 278 Method* method = vf->method();
279 _method_id = method->jmethod_id(); 279 _method_id = method->jmethod_id();
280 _bci = vf->bci(); 280 _bci = vf->bci();