Skip to content

Commit 5e95f3b

Browse files
pshiptonpshipton
authored
Merge pull request #22855 from keithc-ca/systhrow
Use correct data type for SYSTHROW event
2 parents 5470243 + 2800356 commit 5e95f3b

File tree

1 file changed

+46
-49
lines changed

1 file changed

+46
-49
lines changed

‎runtime/rasdump/trigger.c‎

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,59 +1297,59 @@ rasDumpHookClassLoad(J9HookInterface** hookInterface, UDATA eventNum, void* even
12971297

12981298

12991299
static void
1300-
rasDumpHookExceptionThrow(J9HookInterface** hookInterface, UDATA eventNum, void* eventData, void* userData)
1300+
rasDumpHookExceptionThrow(J9HookInterface **hookInterface, UDATA eventNum, void *eventData, void *userData)
13011301
{
13021302
J9VMExceptionThrowEvent *data = eventData;
1303-
J9VMThread* vmThread = data->currentThread;
1304-
J9JavaVM * vm = vmThread->javaVM;
1303+
J9VMThread *vmThread = data->currentThread;
1304+
J9JavaVM *vm = vmThread->javaVM;
13051305
j9object_t exception = data->exception;
1306-
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *) vmThread, exception, JNI_FALSE);
1306+
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *)vmThread, exception, JNI_FALSE);
13071307

13081308
if (NULL != globalRef) {
1309-
J9UTF8* className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
1309+
J9UTF8 *className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
13101310
J9RASdumpEventData dumpData = { 0 };
13111311

13121312
dumpData.detailLength = J9UTF8_LENGTH(className);
13131313
dumpData.detailData = (char *)J9UTF8_DATA(className);
1314-
dumpData.exceptionRef = (j9object_t*) globalRef;
1314+
dumpData.exceptionRef = (j9object_t *)globalRef;
13151315

13161316
vm->j9rasDumpFunctions->triggerDumpAgents(
1317-
vm,
1318-
vmThread,
1319-
J9RAS_DUMP_ON_EXCEPTION_THROW,
1320-
&dumpData);
1317+
vm,
1318+
vmThread,
1319+
J9RAS_DUMP_ON_EXCEPTION_THROW,
1320+
&dumpData);
13211321

1322-
data->exception = *((j9object_t*) globalRef);
1323-
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *) vmThread, globalRef, JNI_FALSE);
1322+
data->exception = *(j9object_t *)globalRef;
1323+
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *)vmThread, globalRef, JNI_FALSE);
13241324
}
13251325
}
13261326

13271327

13281328
static void
1329-
rasDumpHookExceptionCatch(J9HookInterface** hookInterface, UDATA eventNum, void* eventData, void* userData)
1329+
rasDumpHookExceptionCatch(J9HookInterface **hookInterface, UDATA eventNum, void *eventData, void *userData)
13301330
{
13311331
J9VMExceptionCatchEvent *data = eventData;
1332-
J9VMThread* vmThread = data->currentThread;
1333-
J9JavaVM * vm = vmThread->javaVM;
1332+
J9VMThread *vmThread = data->currentThread;
1333+
J9JavaVM *vm = vmThread->javaVM;
13341334
j9object_t exception = data->exception;
1335-
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *) vmThread, exception, JNI_FALSE);
1335+
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *)vmThread, exception, JNI_FALSE);
13361336

13371337
if (NULL != globalRef) {
1338-
J9UTF8* className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
1338+
J9UTF8 *className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
13391339
J9RASdumpEventData dumpData = { 0 };
13401340

13411341
dumpData.detailLength = J9UTF8_LENGTH(className);
13421342
dumpData.detailData = (char *)J9UTF8_DATA(className);
1343-
dumpData.exceptionRef = (j9object_t*) globalRef;
1343+
dumpData.exceptionRef = (j9object_t *)globalRef;
13441344

13451345
vm->j9rasDumpFunctions->triggerDumpAgents(
1346-
vm,
1347-
vmThread,
1348-
J9RAS_DUMP_ON_EXCEPTION_CATCH,
1349-
&dumpData);
1346+
vm,
1347+
vmThread,
1348+
J9RAS_DUMP_ON_EXCEPTION_CATCH,
1349+
&dumpData);
13501350

1351-
data->exception = *((j9object_t*) globalRef);
1352-
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *) vmThread, globalRef, JNI_FALSE);
1351+
data->exception = *(j9object_t *)globalRef;
1352+
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *)vmThread, globalRef, JNI_FALSE);
13531353
}
13541354
}
13551355

@@ -1397,30 +1397,30 @@ rasDumpHookMonitorContendedEnter(J9HookInterface** hookInterface, UDATA eventNum
13971397

13981398

13991399
static void
1400-
rasDumpHookExceptionDescribe(J9HookInterface** hookInterface, UDATA eventNum, void* eventData, void* userData)
1400+
rasDumpHookExceptionDescribe(J9HookInterface **hookInterface, UDATA eventNum, void *eventData, void *userData)
14011401
{
14021402
J9VMExceptionDescribeEvent *data = eventData;
1403-
J9VMThread* vmThread = data->currentThread;
1404-
J9JavaVM * vm = vmThread->javaVM;
1403+
J9VMThread *vmThread = data->currentThread;
1404+
J9JavaVM *vm = vmThread->javaVM;
14051405
j9object_t exception = data->exception;
1406-
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *) vmThread, exception, JNI_FALSE);
1406+
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *)vmThread, exception, JNI_FALSE);
14071407

14081408
if (NULL != globalRef) {
1409-
J9UTF8* className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
1409+
J9UTF8 *className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
14101410
J9RASdumpEventData dumpData = { 0 };
14111411

14121412
dumpData.detailLength = J9UTF8_LENGTH(className);
14131413
dumpData.detailData = (char *)J9UTF8_DATA(className);
1414-
dumpData.exceptionRef = (j9object_t*) globalRef;
1414+
dumpData.exceptionRef = (j9object_t *)globalRef;
14151415

14161416
vm->j9rasDumpFunctions->triggerDumpAgents(
1417-
vm,
1418-
vmThread,
1419-
J9RAS_DUMP_ON_EXCEPTION_DESCRIBE,
1420-
&dumpData);
1417+
vm,
1418+
vmThread,
1419+
J9RAS_DUMP_ON_EXCEPTION_DESCRIBE,
1420+
&dumpData);
14211421

1422-
data->exception = *((j9object_t*) globalRef);
1423-
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *) vmThread, globalRef, JNI_FALSE);
1422+
data->exception = *(j9object_t *)globalRef;
1423+
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *)vmThread, globalRef, JNI_FALSE);
14241424
}
14251425
}
14261426

@@ -1551,37 +1551,34 @@ rasDumpHookClassesUnload(J9HookInterface** hookInterface, UDATA eventNum, void*
15511551
}
15521552
#endif /* J9VM_GC_DYNAMIC_CLASS_UNLOADING */
15531553

1554-
#define CDEV_CURRENT_FUNCTION rasDumpHookExceptionSysthrow
15551554
static void
1556-
rasDumpHookExceptionSysthrow(J9HookInterface** hookInterface, UDATA eventNum, void* eventData, void* userData)
1555+
rasDumpHookExceptionSysthrow(J9HookInterface **hookInterface, UDATA eventNum, void *eventData, void *userData)
15571556
{
1558-
J9VMExceptionThrowEvent *data = eventData;
1559-
J9VMThread* vmThread = data->currentThread;
1560-
J9JavaVM * vm = vmThread->javaVM;
1561-
J9Object* exception = data->exception;
1562-
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *) vmThread, exception, JNI_FALSE);
1557+
J9VMExceptionSysThrowEvent *data = eventData;
1558+
J9VMThread *vmThread = data->currentThread;
1559+
J9JavaVM *vm = vmThread->javaVM;
1560+
j9object_t exception = data->exception;
1561+
jobject globalRef = vm->internalVMFunctions->j9jni_createGlobalRef((JNIEnv *)vmThread, exception, JNI_FALSE);
15631562

15641563
if (NULL != globalRef) {
1565-
J9UTF8* className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
1564+
J9UTF8 *className = J9ROMCLASS_CLASSNAME(J9OBJECT_CLAZZ(vmThread, exception)->romClass);
15661565
J9RASdumpEventData dumpData = { 0 };
15671566

15681567
dumpData.detailLength = J9UTF8_LENGTH(className);
15691568
dumpData.detailData = (char *)J9UTF8_DATA(className);
1570-
dumpData.exceptionRef = (J9Object **) globalRef;
1569+
dumpData.exceptionRef = (j9object_t *)globalRef;
15711570

15721571
vm->j9rasDumpFunctions->triggerDumpAgents(
15731572
vm,
15741573
vmThread,
15751574
J9RAS_DUMP_ON_EXCEPTION_SYSTHROW,
15761575
&dumpData);
15771576

1578-
data->exception = *((J9Object **) globalRef);
1579-
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *) vmThread, globalRef, JNI_FALSE);
1577+
data->exception = *(j9object_t *)globalRef;
1578+
vm->internalVMFunctions->j9jni_deleteGlobalRef((JNIEnv *)vmThread, globalRef, JNI_FALSE);
15801579
}
15811580
}
15821581

1583-
#undef CDEV_CURRENT_FUNCTION
1584-
15851582
static void
15861583
rasDumpHookCorruptCache(J9HookInterface** hookInterface, UDATA eventNum, void* eventData, void* userData)
15871584
{

0 commit comments

Comments
 (0)