Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 557060: Interpose _Throw() on MSVC and centralize pseudo-throw co…
…de in mozalloc. r=ehsan sr=bsmedberg
- Loading branch information
1 parent
34d6cce
commit ce99d82
Showing
20 changed files
with
380 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
| * vim: sw=4 ts=4 et : | ||
| */ | ||
| /* ***** BEGIN LICENSE BLOCK ***** | ||
| * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | ||
| * | ||
| * The contents of this file are subject to the Mozilla Public License Version | ||
| * 1.1 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * http://www.mozilla.org/MPL/ | ||
| * | ||
| * Software distributed under the License is distributed on an "AS IS" basis, | ||
| * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
| * for the specific language governing rights and limitations under the | ||
| * License. | ||
| * | ||
| * The Original Code is Mozilla Code | ||
| * | ||
| * The Initial Developer of the Original Code is | ||
| * The Mozilla Foundation. | ||
| * Portions created by the Initial Developer are Copyright (C) 2010 | ||
| * the Initial Developer. All Rights Reserved. | ||
| * | ||
| * Contributor(s): | ||
| * Chris Jones <jones.chris.g@gmail.com> | ||
| * | ||
| * Alternatively, the contents of this file may be used under the terms of | ||
| * either the GNU General Public License Version 2 or later (the "GPL"), or | ||
| * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | ||
| * in which case the provisions of the GPL or the LGPL are applicable instead | ||
| * of those above. If you wish to allow use of your version of this file only | ||
| * under the terms of either the GPL or the LGPL, and not to allow others to | ||
| * use your version of this file under the terms of the MPL, indicate your | ||
| * decision by deleting the provisions above and replace them with the notice | ||
| * and other provisions required by the GPL or the LGPL. If you do not delete | ||
| * the provisions above, a recipient may use your version of this file under | ||
| * the terms of any one of the MPL, the GPL or the LGPL. | ||
| * | ||
| * ***** END LICENSE BLOCK ***** */ | ||
|
|
||
| #include <stdio.h> | ||
| #include <stdlib.h> // for abort() | ||
|
|
||
| #if defined(_WIN32) | ||
| # include <signal.h> // for raise | ||
| #elif defined(XP_UNIX) | ||
| # include <unistd.h> // for _exit | ||
| #endif | ||
|
|
||
| #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) | ||
| # define MOZALLOC_EXPORT __declspec(dllexport) | ||
| #endif | ||
|
|
||
| #include "mozilla/mozalloc_abort.h" | ||
|
|
||
| static int gDummyCounter; | ||
|
|
||
| void | ||
| mozalloc_abort(const char* const msg) | ||
| { | ||
| fputs(msg, stderr); | ||
| fputs("\n", stderr); | ||
|
|
||
| // XXX/cjones: most of this function was copied from | ||
| // xpcom/base/nsDebugImpl.cpp:Abort(), except that we assume on | ||
| // UNIX-like platforms can directly abort() rather than need to go | ||
| // through PR_Abort(). we don't want this code to rely on NSPR. | ||
|
|
||
| // FIXME/bug 558928: improve implementation for windows/wince | ||
|
|
||
| #if defined(_WIN32) | ||
| # if !defined(WINCE) | ||
| //This should exit us | ||
| raise(SIGABRT); | ||
| # endif | ||
| //If we are ignored exit this way.. | ||
| _exit(3); | ||
| #elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) | ||
| abort(); | ||
| #else | ||
| # warning not attempting to abort() on this platform | ||
| #endif | ||
|
|
||
| // Still haven't aborted? Try dereferencing null. | ||
| // (Written this way to lessen the likelihood of it being optimized away.) | ||
| gDummyCounter += *((int*) 0); // TODO annotation saying we know | ||
| // this is crazy | ||
|
|
||
| // Still haven't aborted? Try _exit(). | ||
| _exit(127); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
| * vim: sw=4 ts=4 et : | ||
| */ | ||
| /* ***** BEGIN LICENSE BLOCK ***** | ||
| * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | ||
| * | ||
| * The contents of this file are subject to the Mozilla Public License Version | ||
| * 1.1 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * http://www.mozilla.org/MPL/ | ||
| * | ||
| * Software distributed under the License is distributed on an "AS IS" basis, | ||
| * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
| * for the specific language governing rights and limitations under the | ||
| * License. | ||
| * | ||
| * The Original Code is Mozilla Code | ||
| * | ||
| * The Initial Developer of the Original Code is | ||
| * The Mozilla Foundation. | ||
| * Portions created by the Initial Developer are Copyright (C) 2010 | ||
| * the Initial Developer. All Rights Reserved. | ||
| * | ||
| * Contributor(s): | ||
| * Chris Jones <jones.chris.g@gmail.com> | ||
| * | ||
| * Alternatively, the contents of this file may be used under the terms of | ||
| * either the GNU General Public License Version 2 or later (the "GPL"), or | ||
| * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | ||
| * in which case the provisions of the GPL or the LGPL are applicable instead | ||
| * of those above. If you wish to allow use of your version of this file only | ||
| * under the terms of either the GPL or the LGPL, and not to allow others to | ||
| * use your version of this file under the terms of the MPL, indicate your | ||
| * decision by deleting the provisions above and replace them with the notice | ||
| * and other provisions required by the GPL or the LGPL. If you do not delete | ||
| * the provisions above, a recipient may use your version of this file under | ||
| * the terms of any one of the MPL, the GPL or the LGPL. | ||
| * | ||
| * ***** END LICENSE BLOCK ***** */ | ||
|
|
||
| #ifndef mozilla_mozalloc_abort_h | ||
| #define mozilla_mozalloc_abort_h | ||
|
|
||
| #if defined(MOZALLOC_EXPORT) | ||
| // do nothing: it's been defined to __declspec(dllexport) by | ||
| // mozalloc*.cpp on platforms where that's required | ||
| #elif defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) | ||
| # define MOZALLOC_EXPORT __declspec(dllimport) | ||
| #elif defined(HAVE_VISIBILITY_ATTRIBUTE) | ||
| /* Make sure symbols are still exported even if we're wrapped in a | ||
| * |visibility push(hidden)| blanket. */ | ||
| # define MOZALLOC_EXPORT __attribute__ ((visibility ("default"))) | ||
| #else | ||
| # define MOZALLOC_EXPORT | ||
| #endif | ||
|
|
||
| /** | ||
| * Terminate this process in such a way that breakpad is triggered, if | ||
| * at all possible. | ||
| */ | ||
| MOZALLOC_EXPORT void mozalloc_abort(const char* const msg) NS_NORETURN; | ||
|
|
||
|
|
||
| #endif /* ifndef mozilla_mozalloc_abort_h */ |
Oops, something went wrong.