diff options
| author | Andy McFadden <fadden@android.com> | 2009-09-25 11:12:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-25 11:12:50 -0700 |
| commit | 4ac33cddbc1186f282a480f9056ace08f50b8140 (patch) | |
| tree | c1ac06e7d6f954ba3de1ff8f1f92be2e5ad42fc0 /vm/Misc.h | |
| parent | 1f7c3839a076ace04c592f4424469707816c9e10 (diff) | |
| parent | 7a37c30a85c58a8c51ae3f9551132a1bf405e4f6 (diff) | |
| download | android_dalvik-4ac33cddbc1186f282a480f9056ace08f50b8140.tar.gz android_dalvik-4ac33cddbc1186f282a480f9056ace08f50b8140.tar.bz2 android_dalvik-4ac33cddbc1186f282a480f9056ace08f50b8140.zip | |
am 7a37c30a: am bb710e32: Remove ((noreturn)) from dvmAbort().
Merge commit '7a37c30a85c58a8c51ae3f9551132a1bf405e4f6'
* commit '7a37c30a85c58a8c51ae3f9551132a1bf405e4f6':
Remove ((noreturn)) from dvmAbort().
Diffstat (limited to 'vm/Misc.h')
| -rw-r--r-- | vm/Misc.h | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -273,12 +273,14 @@ bool dvmSetCloseOnExec(int fd); /* * Unconditionally abort the entire VM. Try not to use this. + * + * NOTE: if this is marked ((noreturn)), gcc will merge multiple dvmAbort() + * calls in a single function together. This is good, in that it reduces + * code size slightly, but also bad, because the native stack trace we + * get from the abort may point at the wrong call site. Best to leave + * it undecorated. */ -void dvmAbort(void) -#if defined(__GNUC__) - __attribute__ ((noreturn)) -#endif - ; +void dvmAbort(void); #if (!HAVE_STRLCPY) /* Implementation of strlcpy() for platforms that don't already have it. */ |