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

Delete unused mono_unbox_int #61384

Merged
merged 3 commits into from
Nov 10, 2021
Merged

Delete unused mono_unbox_int #61384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38f675c
Delete unused mono_unbox_int
am11 Nov 8, 2021
d12bdfe
Fix gcc step display name
am11 Nov 9, 2021
fed947f
Match command invocation order
am11 Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
# Build libs.native, host.native and mono with gcc
- ${{ if eq(parameters.compilerName, 'gcc') }}:
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) libs.native+host.native+mono $(compilerArg) $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(pgoInstrumentArg) $(officialBuildIdArg) -ci
displayName: Build clr+mono+libs.native+host.native
displayName: Build libs.native+host.native+mono

# Sign and add entitlements to these MacOS binaries
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
35 changes: 0 additions & 35 deletions src/mono/wasm/runtime/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,41 +1072,6 @@ mono_wasm_try_unbox_primitive_and_get_type (MonoObject *obj, void *result, int r
return resultType;
}

// FIXME: This function is retained specifically because runtime-test.js uses it
EMSCRIPTEN_KEEPALIVE int
mono_unbox_int (MonoObject *obj)
{
if (!obj)
return 0;
MonoType *type = mono_class_get_type (mono_object_get_class(obj));

void *ptr = mono_object_unbox (obj);
switch (mono_type_get_type (type)) {
case MONO_TYPE_I1:
case MONO_TYPE_BOOLEAN:
return *(signed char*)ptr;
case MONO_TYPE_U1:
return *(unsigned char*)ptr;
case MONO_TYPE_I2:
return *(short*)ptr;
case MONO_TYPE_U2:
return *(unsigned short*)ptr;
case MONO_TYPE_I4:
case MONO_TYPE_I:
return *(int*)ptr;
case MONO_TYPE_U4:
return *(unsigned int*)ptr;
case MONO_TYPE_CHAR:
return *(short*)ptr;
// WASM doesn't support returning longs to JS
// case MONO_TYPE_I8:
// case MONO_TYPE_U8:
default:
printf ("Invalid type %d to mono_unbox_int\n", mono_type_get_type (type));
return 0;
}
}

EMSCRIPTEN_KEEPALIVE int
mono_wasm_array_length (MonoArray *array)
{
Expand Down