mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 711775 - Implement MOZ_NORETURN to encapsulate this-function-doesn't-return semantics. r=cjones 

--HG--
extra : rebase_source : d56f3ef47e11c42b5fe6a442e13fd6202208914f
This commit is contained in:
Jeff Walden 2011-12-17 16:45:29 -05:00
Родитель c7f156e0f6
Коммит 441e281add
13 изменённых файлов: 179 добавлений и 78 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
Makefile.in
Просмотреть файл

@ -62,6 +62,7 @@ tier_base_dirs = \
config \
build \
probes \
mfbt \
$(NULL)
ifndef LIBXUL_SDK

13
configure.in
Просмотреть файл

@ -4141,13 +4141,6 @@ AC_CACHE_CHECK(for __attribute__((warn_unused_result)),
ac_cv_attribute_warn_unused=yes,
ac_cv_attribute_warn_unused=no)])
AC_CACHE_CHECK(for __attribute__((noreturn)),
ac_cv_attribute_noreturn,
[AC_TRY_COMPILE([void f(void) __attribute__((noreturn));],
[],
ac_cv_attribute_noreturn=yes,
ac_cv_attribute_noreturn=no)])
dnl End of C++ language/feature checks
AC_LANG_C
@ -4203,12 +4196,6 @@ else
AC_DEFINE(NS_WARN_UNUSED_RESULT,)
fi
if test "$ac_cv_attribute_noreturn" = yes ; then
AC_DEFINE(NS_NORETURN, [__attribute__((noreturn))])
else
AC_DEFINE(NS_NORETURN,)
fi
dnl We can't run TRY_COMPILE tests on Windows, so hard-code some
dnl features that Windows actually does support.

3
dom/ipc/ContentChild.h
Просмотреть файл

@ -40,6 +40,7 @@
#ifndef mozilla_dom_ContentChild_h
#define mozilla_dom_ContentChild_h
#include "mozilla/Attributes.h"
#include "mozilla/dom/PContentChild.h"
#include "nsTArray.h"
@ -194,7 +195,7 @@ private:
* Exit *now*. Do not shut down XPCOM, do not pass Go, do not run
* static destructors, do not collect $200.
*/
NS_NORETURN void QuickExit();
MOZ_NORETURN void QuickExit();
InfallibleTArray<nsAutoPtr<AlertObserver> > mAlertObservers;
nsRefPtr<ConsoleListener> mConsoleListener;

4
dom/plugins/ipc/PluginModuleChild.h
Просмотреть файл

@ -40,6 +40,8 @@
#ifndef dom_plugins_PluginModuleChild_h
#define dom_plugins_PluginModuleChild_h 1
#include "mozilla/Attributes.h"
#include <string>
#include <vector>
@ -192,7 +194,7 @@ protected:
virtual void
ActorDestroy(ActorDestroyReason why);
NS_NORETURN void QuickExit();
MOZ_NORETURN void QuickExit();
NS_OVERRIDE virtual bool
RecvProcessNativeEventsInRPCCall();

20
js/src/Makefile.in
Просмотреть файл

@ -275,24 +275,10 @@ EXPORTS_js = \
$(NULL)
###############################################
# BEGIN include sources for low-level code shared with Gecko
# BEGIN include sources for low-level code shared with mfbt
#
VPATH += \
$(srcdir)/../../mfbt \
$(NULL)
EXPORTS_NAMESPACES += mozilla
EXPORTS_mozilla = \
Attributes.h \
GuardObjects.h \
MSStdInt.h \
RangedPtr.h \
RefPtr.h \
StdInt.h \
Types.h \
Util.h \
$(NULL)
VPATH += $(srcdir)/../../mfbt
include $(srcdir)/../../mfbt/exported_headers.mk
ifdef ENABLE_METHODJIT

13
js/src/configure.in
Просмотреть файл

@ -3866,13 +3866,6 @@ AC_CACHE_CHECK(for __attribute__((warn_unused_result)),
ac_cv_attribute_warn_unused=yes,
ac_cv_attribute_warn_unused=no)])
AC_CACHE_CHECK(for __attribute__((noreturn)),
ac_cv_attribute_noreturn,
[AC_TRY_COMPILE([void f(void) __attribute__((noreturn));],
[],
ac_cv_attribute_noreturn=yes,
ac_cv_attribute_noreturn=no)])
dnl End of C++ language/feature checks
AC_LANG_C
@ -3928,12 +3921,6 @@ else
AC_DEFINE(NS_WARN_UNUSED_RESULT,)
fi
if test "$ac_cv_attribute_noreturn" = yes ; then
AC_DEFINE(NS_NORETURN, [__attribute__((noreturn))])
else
AC_DEFINE(NS_NORETURN,)
fi
dnl We can't run TRY_COMPILE tests on Windows, so hard-code some
dnl features that Windows actually does support.

7
js/src/jsutil.cpp
Просмотреть файл

@ -38,9 +38,10 @@
*
* ***** END LICENSE BLOCK ***** */
/*
* PR assertion checker.
*/
/* Various JS utility functions. */
#include "mozilla/Attributes.h"
#include <stdio.h>
#include <stdlib.h>
#include "jstypes.h"

4
memory/mozalloc/mozalloc_abort.h
Просмотреть файл

@ -41,6 +41,8 @@
#ifndef mozilla_mozalloc_abort_h
#define mozilla_mozalloc_abort_h
#include "mozilla/Attributes.h"
#if defined(MOZALLOC_EXPORT)
// do nothing: it's been defined to __declspec(dllexport) by
// mozalloc*.cpp on platforms where that's required
@ -58,7 +60,7 @@
* 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;
MOZ_NORETURN MOZALLOC_EXPORT void mozalloc_abort(const char* const msg);
#endif /* ifndef mozilla_mozalloc_abort_h */

51
memory/mozalloc/throw_gcc.h
Просмотреть файл

@ -41,6 +41,9 @@
#ifndef mozilla_throw_gcc_h
#define mozilla_throw_gcc_h
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include <stdio.h> // snprintf
#include <string.h> // strerror
@ -56,92 +59,92 @@ namespace std {
// doing this after careful review because we want to define our own
// exception throwing semantics. Don't try this at home!
NS_ALWAYS_INLINE inline void NS_NORETURN
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_bad_exception(void)
{
mozalloc_abort("fatal: STL threw bad_exception");
}
NS_ALWAYS_INLINE inline void NS_NORETURN
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_bad_alloc(void)
{
mozalloc_abort("fatal: STL threw bad_alloc");
}
NS_ALWAYS_INLINE inline void NS_NORETURN
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_bad_cast(void)
{
mozalloc_abort("fatal: STL threw bad_cast");
}
NS_ALWAYS_INLINE inline void NS_NORETURN
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_bad_typeid(void)
{
mozalloc_abort("fatal: STL threw bad_typeid");
}
NS_ALWAYS_INLINE inline void NS_NORETURN
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_logic_error(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_domain_error(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_invalid_argument(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_invalid_argument(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_length_error(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_length_error(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_out_of_range(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_out_of_range(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_runtime_error(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_runtime_error(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_range_error(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_range_error(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_overflow_error(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_overflow_error(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_underflow_error(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_underflow_error(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_ios_failure(const char* msg)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_ios_failure(const char* msg)
{
mozalloc_abort(msg);
}
NS_ALWAYS_INLINE inline void NS_NORETURN
__throw_system_error(int err)
MOZ_NORETURN MOZ_ALWAYS_INLINE void
__throw_system_error(int err)
{
char error[128];
snprintf(error, sizeof(error)-1,

35
mfbt/Attributes.h
Просмотреть файл

@ -38,7 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
/* Implementations of various C++ class and method modifier attributes. */
/* Implementations of various class and method modifier attributes. */
#ifndef mozilla_Attributes_h_
#define mozilla_Attributes_h_
@ -48,10 +48,6 @@
* code that is (only currently) mfbt-incompatible.
*/
#ifndef __cplusplus
#error "mozilla/Attributes.h is only relevant to C++ code."
#endif
/*
* g++ requires -std=c++0x or -std=gnu++0x to support C++11 functionality
* without warnings (functionality used by the macros below). These modes are
@ -76,6 +72,9 @@
# define MOZ_HAVE_CXX11_OVERRIDE
# define MOZ_HAVE_CXX11_FINAL final
# endif
# if __has_attribute(noreturn)
# define MOZ_HAVE_NORETURN __attribute__((noreturn))
# endif
#elif defined(__GNUC__)
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
# if __GNUC__ > 4
@ -101,14 +100,38 @@
# endif
# endif
# endif
# define MOZ_HAVE_NORETURN __attribute__((noreturn))
#elif defined(_MSC_VER)
# if _MSC_VER >= 1400
# define MOZ_HAVE_CXX11_OVERRIDE
/* MSVC currently spells "final" as "sealed". */
# define MOZ_HAVE_CXX11_FINAL sealed
# endif
# define MOZ_HAVE_NORETURN __declspec(noreturn)
#endif
/*
* MOZ_NORETURN, specified at the start of a function declaration, indicates
* that the given function does not return. (The function definition does not
* need to be annotated.)
*
* MOZ_NORETURN void abort(const char* msg);
*
* This modifier permits the compiler to optimize code assuming a call to such a
* function will never return. It also enables the compiler to avoid spurious
* warnings about not initializing variables, or about any other seemingly-dodgy
* operations performed after the function returns.
*
* This modifier does not affect the corresponding function's linking behavior.
*/
#if defined(MOZ_HAVE_NORETURN)
# define MOZ_NORETURN MOZ_HAVE_NORETURN
#else
# define MOZ_NORETURN /* no support */
#endif
#ifdef __cplusplus
/*
* MOZ_DELETE, specified immediately prior to the ';' terminating an undefined-
* method declaration, attempts to delete that method from the corresponding
@ -247,4 +270,6 @@
# define MOZ_FINAL /* no support */
#endif
#endif /* __cplusplus */
#endif /* mozilla_Attributes_h_ */

52
mfbt/Makefile.in Normal file
Просмотреть файл

@ -0,0 +1,52 @@
# ***** 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 the Mozilla Framework Based on Templates.
#
# The Initial Developer of the Original Code is
# the Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2011
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Jeff Walden <jwalden+code@mit.edu>
#
# 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 *****
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS =
# exported_headers.mk defines the headers exported by mfbt. It is included by
# mfbt itself and by the JS engine, which, when built standalone, must do the
# work to install mfbt's exported headers itself.
include $(srcdir)/exported_headers.mk
include $(topsrcdir)/config/rules.mk

1
mfbt/Util.h
Просмотреть файл

@ -40,6 +40,7 @@
#ifndef mozilla_Util_h_
#define mozilla_Util_h_
#include "mozilla/Attributes.h"
#include "mozilla/Types.h"
/*

53
mfbt/exported_headers.mk Normal file
Просмотреть файл

@ -0,0 +1,53 @@
# ***** 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 the Mozilla Framework Based on Templates.
#
# The Initial Developer of the Original Code is
# the Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2011
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Jeff Walden <jwalden+code@mit.edu>
#
# 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 *****
# This file defines the headers exported by mfbt. It is included by mfbt
# itself and by the JS engine, which, when built standalone, must install
# mfbt's exported headers itself.
EXPORTS_NAMESPACES += mozilla
EXPORTS_mozilla += \
Attributes.h \
GuardObjects.h \
MSStdInt.h \
RangedPtr.h \
RefPtr.h \
StdInt.h \
Types.h \
Util.h \
$(NULL)