Rename Crash() to IntentionalCrash() so that automation can grep for it. Make it non-static, and add trailing instructions to it so that it isn't inlined nor tail-called away in crash reports.

--HG--
extra : transplant_source : %D7R%95%D1%FD%14%F3%F0V%033%0BQ%3F%9E%AB%E4%A7%A7J
This commit is contained in:
Benjamin Smedberg 2010-01-25 17:26:23 -05:00
parent 4ab92db462
commit 05f44c363f

View File

@ -64,8 +64,10 @@
// Intentional crash
//
static void
Crash()
int gCrashCount = 0;
void
IntentionalCrash()
{
char* bloatLog = getenv("XPCOM_MEM_BLOAT_LOG");
if (bloatLog) {
@ -84,6 +86,7 @@ Crash()
}
void (*funcptr)() = NULL;
funcptr(); // Crash calling null function pointer
++gCrashCount;
}
//
@ -675,7 +678,7 @@ NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char*
instanceData->npnNewStream = true;
}
if (strcmp(argn[i], "newcrash") == 0) {
Crash();
IntentionalCrash();
}
}
@ -758,7 +761,7 @@ NPP_Destroy(NPP instance, NPSavedData** save)
InstanceData* instanceData = (InstanceData*)(instance->pdata);
if (instanceData->crashOnDestroy)
Crash();
IntentionalCrash();
if (instanceData->streamBuf) {
free(instanceData->streamBuf);
@ -2101,7 +2104,7 @@ streamTest(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant*
static bool
crashPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result)
{
Crash();
IntentionalCrash();
VOID_TO_NPVARIANT(*result);
return true;
}