xnu-3248.30.4.tar.gz

[apple/xnu.git] / osfmk / kern / assert.h

diff --git a/osfmk/kern/assert.h b/osfmk/kern/assert.h
index 2bee195d40e64b7a11b6f973e338eb269b32af0b..4c60056fbde755298b66df60136edb1643b68754 100644 (file)
--- a/osfmk/kern/assert.h
+++ b/osfmk/kern/assert.h
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -66,23 +71,28 @@
 __BEGIN_DECLS
 /* Assert error */
 extern void    Assert(
-                       const char      *file,
-                       int             line,
-                       const char      *expression);
+       const char      *file,
+       int             line,
+       const char      *expression) __attribute__((noinline));
+
+#if CONFIG_NO_PANIC_STRINGS
+#define Assert(file, line, ex) (Assert)("", line, "")
+#endif
+
 __END_DECLS
 
 #if    MACH_ASSERT
 
 #define assert(ex)  \
-    ((ex) ? (void)0 : Assert(__FILE__, __LINE__, # ex))
-#define        assert_static(x)        assert(x)
+       (__builtin_expect(!!((long)(ex)), 1L) ? (void)0 : Assert(__FILE__, __LINE__, # ex))
+#define assert_static(ex) _Static_assert((ex), #ex)
 
 #define __assert_only
 
 #else  /* MACH_ASSERT */
 
-#define assert(ex)             ((void)0)
-#define assert_static(ex)
+#define assert(ex) ((void)0)
+#define assert_static(ex) _Static_assert((ex), #ex)
 
 #define __assert_only __unused