Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature-request' into feature-re…
Browse files Browse the repository at this point in the history
…quest

# Conflicts:
#	runtime/rastrace/method_trace.c
  • Loading branch information
h3110n3rv3 committed Nov 19, 2024
1 parent 3085a1b commit 4270c4b
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions runtime/rastrace/method_trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,9 +486,7 @@ traceMethodArgObject(J9VMThread *thr, UDATA* arg0EA, char* cursor, UDATA length)
J9InternalVMFunctions const * const vmFuncs = thr->javaVM->internalVMFunctions;
char *stringArgUTF8 = vmFuncs->copyStringToUTF8WithMemAlloc(thr, object, J9_STR_NULL_TERMINATE_RESULT, " ", 2, stringArgBuffer, J9_ARRAY_DIMENSION_LIMIT, NULL);
j9str_printf(PORTLIB, cursor, length, "%.*s@%.*s", (U_32)J9UTF8_LENGTH(className), J9UTF8_DATA(className), J9UTF8_LENGTH(stringArgUTF8), J9UTF8_DATA(stringArgUTF8));
}
else
{
} else {
/* TODO: handle arrays */
j9str_printf(PORTLIB, cursor, length, "%.*s@%p", (U_32)J9UTF8_LENGTH(className), J9UTF8_DATA(className), object);
}
Expand Down

0 comments on commit 4270c4b

Please sign in to comment.