| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #import "platform/mac/BlockExceptions.h" | 26 #import "platform/mac/BlockExceptions.h" |
| 27 | 27 |
| 28 #import "wtf/Assertions.h" | 28 #import "wtf/Assertions.h" |
| 29 | 29 |
| 30 void ReportBlockedObjCException(NSException *exception) | 30 void ReportBlockedObjCException(NSException *exception) |
| 31 { | 31 { |
| 32 #if ENABLE(ASSERT) | 32 #if DCHECK_IS_ON() |
| 33 ASSERT_WITH_MESSAGE(0, "Uncaught exception - %s", [[exception description] U
TF8String]); | 33 NOTREACHED() << "Uncaught exception - " << [[exception description] UTF8Stri
ng]; |
| 34 // This function is marked as NO_RETURN_DUE_TO_ASSERT, but NOTREACHED() and |
| 35 // DCHECK(false) are not recognized as NO_RETURN. |
| 36 CRASH(); |
| 34 #else | 37 #else |
| 35 NSLog(@"*** WebKit discarding exception: <%@> %@", [exception name], [except
ion reason]); | 38 NSLog(@"*** WebKit discarding exception: <%@> %@", [exception name], [except
ion reason]); |
| 36 #endif | 39 #endif |
| 37 } | 40 } |
| OLD | NEW |