Tue, 11 May 2010 14:35:43 -0700
6931180: Migration to recent versions of MS Platform SDK
6951582: Build problems on win64
Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010
Reviewed-by: ohair, art, ccheung, dcubed
duke@435 | 1 | /* |
duke@435 | 2 | * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
duke@435 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@435 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@435 | 21 | * have any questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | #include "incls/_precompiled.incl" |
duke@435 | 26 | #include "incls/_preserveException.cpp.incl" |
duke@435 | 27 | |
duke@435 | 28 | // TODO: These three classes should be refactored |
duke@435 | 29 | |
duke@435 | 30 | PreserveExceptionMark::PreserveExceptionMark(Thread*& thread) { |
duke@435 | 31 | thread = Thread::current(); |
duke@435 | 32 | _thread = thread; |
duke@435 | 33 | _preserved_exception_oop = Handle(thread, _thread->pending_exception()); |
duke@435 | 34 | _thread->clear_pending_exception(); // Needed to avoid infinite recursion |
duke@435 | 35 | _preserved_exception_line = _thread->exception_line(); |
duke@435 | 36 | _preserved_exception_file = _thread->exception_file(); |
duke@435 | 37 | } |
duke@435 | 38 | |
duke@435 | 39 | |
duke@435 | 40 | PreserveExceptionMark::~PreserveExceptionMark() { |
duke@435 | 41 | if (_thread->has_pending_exception()) { |
duke@435 | 42 | oop exception = _thread->pending_exception(); |
duke@435 | 43 | _thread->clear_pending_exception(); // Needed to avoid infinite recursion |
duke@435 | 44 | exception->print(); |
duke@435 | 45 | fatal("PreserveExceptionMark destructor expects no pending exceptions"); |
duke@435 | 46 | } |
duke@435 | 47 | if (_preserved_exception_oop() != NULL) { |
duke@435 | 48 | _thread->set_pending_exception(_preserved_exception_oop(), _preserved_exception_file, _preserved_exception_line); |
duke@435 | 49 | } |
duke@435 | 50 | } |
duke@435 | 51 | |
duke@435 | 52 | |
duke@435 | 53 | // This code is cloned from PreserveExceptionMark, except that: |
duke@435 | 54 | // returned pending exceptions do not cause a crash. |
duke@435 | 55 | // thread is passed in, not set (not a reference parameter) |
duke@435 | 56 | // and bug 6431341 has been addressed. |
duke@435 | 57 | |
duke@435 | 58 | CautiouslyPreserveExceptionMark::CautiouslyPreserveExceptionMark(Thread* thread) { |
duke@435 | 59 | _thread = thread; |
duke@435 | 60 | _preserved_exception_oop = Handle(thread, _thread->pending_exception()); |
duke@435 | 61 | _preserved_exception_line = _thread->exception_line(); |
duke@435 | 62 | _preserved_exception_file = _thread->exception_file(); |
duke@435 | 63 | _thread->clear_pending_exception(); // Pending exceptions are checked in the destructor |
duke@435 | 64 | } |
duke@435 | 65 | |
duke@435 | 66 | |
duke@435 | 67 | CautiouslyPreserveExceptionMark::~CautiouslyPreserveExceptionMark() { |
duke@435 | 68 | assert(!_thread->has_pending_exception(), "unexpected exception generated"); |
duke@435 | 69 | if (_thread->has_pending_exception()) { |
duke@435 | 70 | _thread->clear_pending_exception(); |
duke@435 | 71 | } |
duke@435 | 72 | if (_preserved_exception_oop() != NULL) { |
duke@435 | 73 | _thread->set_pending_exception(_preserved_exception_oop(), _preserved_exception_file, _preserved_exception_line); |
duke@435 | 74 | } |
duke@435 | 75 | } |
duke@435 | 76 | |
duke@435 | 77 | |
duke@435 | 78 | void WeakPreserveExceptionMark::preserve() { |
duke@435 | 79 | _preserved_exception_oop = Handle(_thread, _thread->pending_exception()); |
duke@435 | 80 | _preserved_exception_line = _thread->exception_line(); |
duke@435 | 81 | _preserved_exception_file = _thread->exception_file(); |
duke@435 | 82 | _thread->clear_pending_exception(); |
duke@435 | 83 | } |
duke@435 | 84 | |
duke@435 | 85 | void WeakPreserveExceptionMark::restore() { |
duke@435 | 86 | if (!_thread->has_pending_exception()) { |
duke@435 | 87 | _thread->set_pending_exception(_preserved_exception_oop(), _preserved_exception_file, _preserved_exception_line); |
duke@435 | 88 | } |
duke@435 | 89 | } |