Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mono][interp] Add intrinsic for string allocation #79392

Merged
merged 2 commits into from Dec 8, 2022
Merged

[mono][interp] Add intrinsic for string allocation #79392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba57f45
[mono][metadata] Remove redundant use of coop handles
BrzVlad Dec 8, 2022
47eb9d0
[mono][interp] Add intrinsic for string allocation
BrzVlad Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/mono/mono/metadata/gc-internals.h
View file
Open in desktop
Expand Up @@ -154,9 +154,6 @@ mono_gc_alloc_handle_array (MonoVTable *vtable, gsize size, gsize max_length, gs
MonoString*
mono_gc_alloc_string (MonoVTable *vtable, size_t size, gint32 len);

MonoStringHandle
mono_gc_alloc_handle_string (MonoVTable *vtable, gsize size, gint32 len);

MonoObject*
mono_gc_alloc_mature (MonoVTable *vtable, size_t size);

Expand Down
6 changes: 0 additions & 6 deletions src/mono/mono/metadata/gc.c
View file
Open in desktop
Expand Up @@ -1256,12 +1256,6 @@ mono_gc_alloc_handle_array (MonoVTable *vtable, gsize size, gsize max_length, gs
return MONO_HANDLE_NEW (MonoArray, mono_gc_alloc_array (vtable, size, max_length, bounds_size));
}

MonoStringHandle
mono_gc_alloc_handle_string (MonoVTable *vtable, gsize size, gint32 len)
{
return MONO_HANDLE_NEW (MonoString, mono_gc_alloc_string (vtable, size, len));
}

MonoObjectHandle
mono_gc_alloc_handle_mature (MonoVTable *vtable, gsize size)
{
Expand Down
23 changes: 11 additions & 12 deletions src/mono/mono/metadata/object.c
View file
Open in desktop
Expand Up @@ -6142,10 +6142,16 @@ mono_string_new_size (MonoDomain *domain, gint32 len)

MonoStringHandle
mono_string_new_size_handle (gint32 len, MonoError *error)
{
return MONO_HANDLE_NEW (MonoString, mono_string_new_size_checked (len, error));
}

MonoString*
mono_string_new_size_checked (gint32 len, MonoError *error)
{
MONO_REQ_GC_UNSAFE_MODE;

MonoStringHandle s;
MonoString *s;
MonoVTable *vtable;
size_t size;

Expand All @@ -6154,30 +6160,23 @@ mono_string_new_size_handle (gint32 len, MonoError *error)
/* check for overflow */
if (len < 0 || len > ((SIZE_MAX - G_STRUCT_OFFSET (MonoString, chars) - 8) / 2)) {
mono_error_set_out_of_memory (error, "Could not allocate %i bytes", -1);
return NULL_HANDLE_STRING;
return NULL;
}

size = (G_STRUCT_OFFSET (MonoString, chars) + (((size_t)len + 1) * 2));
g_assert (size > 0);

vtable = mono_class_vtable_checked (mono_defaults.string_class, error);
return_val_if_nok (error, NULL_HANDLE_STRING);
return_val_if_nok (error, NULL);

s = mono_gc_alloc_handle_string (vtable, size, len);
s = mono_gc_alloc_string (vtable, size, len);

if (G_UNLIKELY (MONO_HANDLE_IS_NULL (s)))
if (G_UNLIKELY (!s))
mono_error_set_out_of_memory (error, "Could not allocate %" G_GSIZE_FORMAT " bytes", size);

return s;
}

MonoString *
mono_string_new_size_checked (gint32 length, MonoError *error)
{
HANDLE_FUNCTION_ENTER ();
HANDLE_FUNCTION_RETURN_OBJ (mono_string_new_size_handle (length, error));
}

/**
* mono_string_new_len:
* \param text a pointer to an utf8 string
Expand Down
8 changes: 8 additions & 0 deletions src/mono/mono/mini/interp/interp.c
View file
Open in desktop
Expand Up @@ -6211,6 +6211,14 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;

MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_NEWSTR) {
LOCAL_VAR (ip [1], MonoString*) = mono_string_new_size_checked (LOCAL_VAR (ip [2], gint32), error);
if (!is_ok (error)) {
THROW_EX (interp_error_convert_to_exception (frame, error, ip), ip);
}
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_LDLEN) {
MonoObject *o = LOCAL_VAR (ip [2], MonoObject*);
NULL_CHECK (o);
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/interp/mintops.def
View file
Open in desktop
Expand Up @@ -368,6 +368,7 @@ OPDEF(MINT_ISINST_INTERFACE, "isinst.interface", 4, 1, 1, MintOpClassToken)
OPDEF(MINT_CASTCLASS_COMMON, "castclass.common", 4, 1, 1, MintOpClassToken)
OPDEF(MINT_ISINST_COMMON, "isinst.common", 4, 1, 1, MintOpClassToken)
OPDEF(MINT_NEWARR, "newarr", 4, 1, 1, MintOpClassToken)
OPDEF(MINT_NEWSTR, "newstr", 3, 1, 1, MintOpNoArgs)
OPDEF(MINT_BOX, "box", 4, 1, 1, MintOpShortInt)
OPDEF(MINT_BOX_VT, "box.vt", 4, 1, 1, MintOpShortInt)
OPDEF(MINT_BOX_PTR, "box.ptr", 4, 1, 1, MintOpShortInt)
Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Expand Up @@ -1967,6 +1967,9 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
*op = MINT_GETCHR;
else if (strcmp (tm, "get_Length") == 0)
*op = MINT_STRLEN;
} else if (tm [0] == 'F') {
if (strcmp (tm, "FastAllocateString") == 0)
*op = MINT_NEWSTR;
}
} else if (mono_class_is_subclass_of_internal (target_method->klass, mono_defaults.array_class, FALSE)) {
if (!strcmp (tm, "get_Rank")) {
Expand Down