Skip to content

[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

Merged
BrzVlad merged 3 commits into from
May 31, 2022
Merged

[mono] Fix diamond pattern encountered with static virtual interface methods #69738

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
e2165fc
[mono][mini] Throw exception if we have conflicts with static virtual…
BrzVlad May 24, 2022
d8dd4e9
[mono][interp] Throw exception if we have conflicts with static virtu…
BrzVlad May 24, 2022
e8367e2
[mono][mini] Fix method access check during ldftn
BrzVlad May 24, 2022
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
18 changes: 18 additions & 0 deletions src/mono/mono/metadata/class-accessors.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
GSList *l = mono_class_get_dim_conflicts (klass);
MonoMethod *decl = method;

if (decl->is_inflated)
decl = ((MonoMethodInflated*)decl)->declaring;

while (l) {
if (decl == l->data)
return TRUE;
l = l->next;
}

return FALSE;
}

typedef struct {
MonoPropertyBagItem head;

Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/metadata/class-internals.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/metadata/jit-icall-reg.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down
41 changes: 11 additions & 30 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

interp_add_ins (td, MINT_ICALL_V_V);
interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

interp_add_ins (td, MINT_ICALL_V_V);
interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
td->last_ins->info.call_args = NULL;
td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

interp_add_ins (td, MINT_ICALL_V_V);
// Allocate a dummy local to serve as dreg for this instruction
push_simple_type (td, STACK_TYPE_I4);
td->sp--;
interp_ins_set_dreg (td->last_ins, td->sp [0].local);
td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
} else if (in_corlib &&
(!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
!strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
}

return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
MonoMethod *virt_method = target_method;
target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
}

return_val_if_nok (error, FALSE);
if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
mono_class_setup_vtable (target_method->klass);

// Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
else
is_virtual = TRUE;
}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
m = mono_marshal_get_synchronized_wrapper (m);

if (constrained_class) {
MonoMethod *virt_method = m;
m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
goto_if_nok (error, exit);
if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
constrained_class = NULL;
}

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
mono_method_has_unmanaged_callers_only_attribute (m))) {

if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
interp_add_ins (td, MINT_LDNULL);
push_simple_type (td, STACK_TYPE_MP);
interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down
8 changes: 8 additions & 0 deletions src/mono/mono/mini/jit-icalls.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
return d;
}

void
mono_throw_ambiguous_implementation (void)
{
ERROR_DECL (error);
mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down
2 changes: 2 additions & 0 deletions src/mono/mono/mini/jit-icalls.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down
18 changes: 12 additions & 6 deletions src/mono/mono/mini/method-to-ir.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
CHECK_CFG_ERROR;

if (mono_class_has_dim_conflicts (constrained_class) &&
mono_class_is_method_ambiguous (constrained_class, cil_method))
mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
/* Use the corresponding method from the base type to avoid boxing */
MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
MonoMethod *cil_method;
gboolean gshared_static_virtual = FALSE;

cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
CHECK_CFG_ERROR;

if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
emit_method_access_failure (cfg, method, cil_method);

if (constrained_class) {
if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
gshared_static_virtual = TRUE;
} else {
cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
constrained_class = NULL;
CHECK_CFG_ERROR;
if (mono_class_has_dim_conflicts (constrained_class) &&
mono_class_is_method_ambiguous (constrained_class, cil_method))
mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
constrained_class = NULL;
}
} else {
// we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

context_used = mini_method_check_context_used (cfg, cmethod);

cil_method = cmethod;
if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
emit_method_access_failure (cfg, method, cil_method);

const gboolean has_unmanaged_callers_only =
cmethod->wrapper_type == MONO_WRAPPER_NONE &&
mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/mini-runtime.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down
30 changes: 7 additions & 23 deletions src/mono/mono/mini/mini-trampolines.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
return_val_if_nok (error, NULL);

if (mono_class_has_dim_conflicts (vt->klass)) {
GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
GSList *l;
MonoMethod *decl = imt_method;

if (decl->is_inflated)
decl = mono_method_get_declaring_generic_method (decl);

gboolean in_conflict = FALSE;
for (l = conflicts; l; l = l->next) {
if (decl == l->data) {
in_conflict = TRUE;
break;
}
}
if (in_conflict) {
char *class_name = mono_class_full_name (vt->klass);
char *method_name = mono_method_full_name (decl, TRUE);
mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
g_free (class_name);
g_free (method_name);
return NULL;
}
if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
char *class_name = mono_class_full_name (vt->klass);
char *method_name = mono_method_full_name (imt_method, TRUE);
mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
g_free (class_name);
g_free (method_name);
return NULL;
}

/* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[mono] Fix diamond pattern encountered with static virtual interface methods by BrzVlad · Pull Request #69738 · dotnet/runtime · GitHub
Skip to content
[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

 Merged

BrzVlad
merged 3 commits into

from

May 31, 2022
 Merged


[mono] Fix diamond pattern encountered with static virtual interface methods
#69738
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
e2165fc

[mono][mini] Throw exception if we have conflicts with static virtual…


BrzVlad May 24, 2022
d8dd4e9

[mono][interp] Throw exception if we have conflicts with static virtu…


BrzVlad May 24, 2022
e8367e2

[mono][mini] Fix method access check during ldftn


BrzVlad May 24, 2022

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


18 changes: 18 additions & 0 deletions
src/mono/mono/metadata/class-accessors.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
	return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
	GSList *l = mono_class_get_dim_conflicts (klass);
	MonoMethod *decl = method;

	if (decl->is_inflated)
 decl = ((MonoMethodInflated*)decl)->declaring;

	while (l) {
 if (decl == l->data)
 return TRUE;
 l = l->next;
	}

	return FALSE;
}

typedef struct {
	MonoPropertyBagItem head;

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/class-internals.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/metadata/jit-icall-reg.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down

41 changes: 11 additions & 30 deletions
src/mono/mono/mini/interp/transform.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
	MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
	td->last_ins->info.call_args = NULL;
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	// Allocate a dummy local to serve as dreg for this instruction
	push_simple_type (td, STACK_TYPE_I4);
	td->sp--;
	interp_ins_set_dreg (td->last_ins, td->sp [0].local);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
	} else if (in_corlib &&
 (!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
 !strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
	}

	return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
 g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
 MonoMethod *virt_method = target_method;
 target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
 g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
 }

 return_val_if_nok (error, FALSE);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 mono_class_setup_vtable (target_method->klass);

 // Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

	if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
 if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
 else
 is_virtual = TRUE;
	}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 m = mono_marshal_get_synchronized_wrapper (m);

 if (constrained_class) {
 MonoMethod *virt_method = m;
 m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
 goto_if_nok (error, exit);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 constrained_class = NULL;
 }

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 mono_method_has_unmanaged_callers_only_attribute (m))) {

 if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
 interp_add_ins (td, MINT_LDNULL);
 push_simple_type (td, STACK_TYPE_MP);
 interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/mono/mini/jit-icalls.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
	return d;
}

void
mono_throw_ambiguous_implementation (void)
{
	ERROR_DECL (error);
	mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
	mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down

2 changes: 2 additions & 0 deletions
src/mono/mono/mini/jit-icalls.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down

18 changes: 12 additions & 6 deletions
src/mono/mono/mini/method-to-ir.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
 CHECK_CFG_ERROR;

 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

 if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
 /* Use the corresponding method from the base type to avoid boxing */
 MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 MonoMethod *cil_method;
 gboolean gshared_static_virtual = FALSE;

 cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
 CHECK_CFG_ERROR;

 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 if (constrained_class) {
 if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
 gshared_static_virtual = TRUE;
 } else {
 cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
 constrained_class = NULL;
 CHECK_CFG_ERROR;
 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
 constrained_class = NULL;
 }
 } else {
 // we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

 context_used = mini_method_check_context_used (cfg, cmethod);

 cil_method = cmethod;
 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 const gboolean has_unmanaged_callers_only =
 cmethod->wrapper_type == MONO_WRAPPER_NONE &&
 mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/mini-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
	register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
	register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down

30 changes: 7 additions & 23 deletions
src/mono/mono/mini/mini-trampolines.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
 vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
 return_val_if_nok (error, NULL);

 if (mono_class_has_dim_conflicts (vt->klass)) {
 GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
 GSList *l;
 MonoMethod *decl = imt_method;

 if (decl->is_inflated)
 decl = mono_method_get_declaring_generic_method (decl);

 gboolean in_conflict = FALSE;
 for (l = conflicts; l; l = l->next) {
 if (decl == l->data) {
 in_conflict = TRUE;
 break;
 }
 }
 if (in_conflict) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (decl, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }
 if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (imt_method, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }

 /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[mono] Fix diamond pattern encountered with static virtual interface methods by BrzVlad · Pull Request #69738 · dotnet/runtime · GitHub
Skip to content
[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

 Merged

BrzVlad
merged 3 commits into

from

May 31, 2022
 Merged


[mono] Fix diamond pattern encountered with static virtual interface methods
#69738
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
e2165fc

[mono][mini] Throw exception if we have conflicts with static virtual…


BrzVlad May 24, 2022
d8dd4e9

[mono][interp] Throw exception if we have conflicts with static virtu…


BrzVlad May 24, 2022
e8367e2

[mono][mini] Fix method access check during ldftn


BrzVlad May 24, 2022

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


18 changes: 18 additions & 0 deletions
src/mono/mono/metadata/class-accessors.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
	return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
	GSList *l = mono_class_get_dim_conflicts (klass);
	MonoMethod *decl = method;

	if (decl->is_inflated)
 decl = ((MonoMethodInflated*)decl)->declaring;

	while (l) {
 if (decl == l->data)
 return TRUE;
 l = l->next;
	}

	return FALSE;
}

typedef struct {
	MonoPropertyBagItem head;

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/class-internals.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/metadata/jit-icall-reg.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down

41 changes: 11 additions & 30 deletions
src/mono/mono/mini/interp/transform.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
	MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
	td->last_ins->info.call_args = NULL;
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	// Allocate a dummy local to serve as dreg for this instruction
	push_simple_type (td, STACK_TYPE_I4);
	td->sp--;
	interp_ins_set_dreg (td->last_ins, td->sp [0].local);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
	} else if (in_corlib &&
 (!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
 !strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
	}

	return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
 g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
 MonoMethod *virt_method = target_method;
 target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
 g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
 }

 return_val_if_nok (error, FALSE);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 mono_class_setup_vtable (target_method->klass);

 // Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

	if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
 if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
 else
 is_virtual = TRUE;
	}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 m = mono_marshal_get_synchronized_wrapper (m);

 if (constrained_class) {
 MonoMethod *virt_method = m;
 m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
 goto_if_nok (error, exit);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 constrained_class = NULL;
 }

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 mono_method_has_unmanaged_callers_only_attribute (m))) {

 if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
 interp_add_ins (td, MINT_LDNULL);
 push_simple_type (td, STACK_TYPE_MP);
 interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/mono/mini/jit-icalls.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
	return d;
}

void
mono_throw_ambiguous_implementation (void)
{
	ERROR_DECL (error);
	mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
	mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down

2 changes: 2 additions & 0 deletions
src/mono/mono/mini/jit-icalls.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down

18 changes: 12 additions & 6 deletions
src/mono/mono/mini/method-to-ir.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
 CHECK_CFG_ERROR;

 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

 if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
 /* Use the corresponding method from the base type to avoid boxing */
 MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 MonoMethod *cil_method;
 gboolean gshared_static_virtual = FALSE;

 cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
 CHECK_CFG_ERROR;

 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 if (constrained_class) {
 if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
 gshared_static_virtual = TRUE;
 } else {
 cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
 constrained_class = NULL;
 CHECK_CFG_ERROR;
 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
 constrained_class = NULL;
 }
 } else {
 // we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

 context_used = mini_method_check_context_used (cfg, cmethod);

 cil_method = cmethod;
 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 const gboolean has_unmanaged_callers_only =
 cmethod->wrapper_type == MONO_WRAPPER_NONE &&
 mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/mini-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
	register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
	register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down

30 changes: 7 additions & 23 deletions
src/mono/mono/mini/mini-trampolines.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
 vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
 return_val_if_nok (error, NULL);

 if (mono_class_has_dim_conflicts (vt->klass)) {
 GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
 GSList *l;
 MonoMethod *decl = imt_method;

 if (decl->is_inflated)
 decl = mono_method_get_declaring_generic_method (decl);

 gboolean in_conflict = FALSE;
 for (l = conflicts; l; l = l->next) {
 if (decl == l->data) {
 in_conflict = TRUE;
 break;
 }
 }
 if (in_conflict) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (decl, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }
 if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (imt_method, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }

 /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[mono] Fix diamond pattern encountered with static virtual interface methods by BrzVlad · Pull Request #69738 · dotnet/runtime · GitHub
Skip to content
[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

 Merged

BrzVlad
merged 3 commits into

from

May 31, 2022
 Merged


[mono] Fix diamond pattern encountered with static virtual interface methods
#69738
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
e2165fc

[mono][mini] Throw exception if we have conflicts with static virtual…


BrzVlad May 24, 2022
d8dd4e9

[mono][interp] Throw exception if we have conflicts with static virtu…


BrzVlad May 24, 2022
e8367e2

[mono][mini] Fix method access check during ldftn


BrzVlad May 24, 2022

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


18 changes: 18 additions & 0 deletions
src/mono/mono/metadata/class-accessors.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
	return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
	GSList *l = mono_class_get_dim_conflicts (klass);
	MonoMethod *decl = method;

	if (decl->is_inflated)
 decl = ((MonoMethodInflated*)decl)->declaring;

	while (l) {
 if (decl == l->data)
 return TRUE;
 l = l->next;
	}

	return FALSE;
}

typedef struct {
	MonoPropertyBagItem head;

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/class-internals.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/metadata/jit-icall-reg.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down

41 changes: 11 additions & 30 deletions
src/mono/mono/mini/interp/transform.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
	MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
	td->last_ins->info.call_args = NULL;
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	// Allocate a dummy local to serve as dreg for this instruction
	push_simple_type (td, STACK_TYPE_I4);
	td->sp--;
	interp_ins_set_dreg (td->last_ins, td->sp [0].local);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
	} else if (in_corlib &&
 (!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
 !strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
	}

	return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
 g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
 MonoMethod *virt_method = target_method;
 target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
 g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
 }

 return_val_if_nok (error, FALSE);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 mono_class_setup_vtable (target_method->klass);

 // Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

	if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
 if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
 else
 is_virtual = TRUE;
	}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 m = mono_marshal_get_synchronized_wrapper (m);

 if (constrained_class) {
 MonoMethod *virt_method = m;
 m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
 goto_if_nok (error, exit);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 constrained_class = NULL;
 }

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 mono_method_has_unmanaged_callers_only_attribute (m))) {

 if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
 interp_add_ins (td, MINT_LDNULL);
 push_simple_type (td, STACK_TYPE_MP);
 interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/mono/mini/jit-icalls.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
	return d;
}

void
mono_throw_ambiguous_implementation (void)
{
	ERROR_DECL (error);
	mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
	mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down

2 changes: 2 additions & 0 deletions
src/mono/mono/mini/jit-icalls.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down

18 changes: 12 additions & 6 deletions
src/mono/mono/mini/method-to-ir.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
 CHECK_CFG_ERROR;

 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

 if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
 /* Use the corresponding method from the base type to avoid boxing */
 MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 MonoMethod *cil_method;
 gboolean gshared_static_virtual = FALSE;

 cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
 CHECK_CFG_ERROR;

 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 if (constrained_class) {
 if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
 gshared_static_virtual = TRUE;
 } else {
 cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
 constrained_class = NULL;
 CHECK_CFG_ERROR;
 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
 constrained_class = NULL;
 }
 } else {
 // we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

 context_used = mini_method_check_context_used (cfg, cmethod);

 cil_method = cmethod;
 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 const gboolean has_unmanaged_callers_only =
 cmethod->wrapper_type == MONO_WRAPPER_NONE &&
 mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/mini-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
	register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
	register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down

30 changes: 7 additions & 23 deletions
src/mono/mono/mini/mini-trampolines.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
 vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
 return_val_if_nok (error, NULL);

 if (mono_class_has_dim_conflicts (vt->klass)) {
 GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
 GSList *l;
 MonoMethod *decl = imt_method;

 if (decl->is_inflated)
 decl = mono_method_get_declaring_generic_method (decl);

 gboolean in_conflict = FALSE;
 for (l = conflicts; l; l = l->next) {
 if (decl == l->data) {
 in_conflict = TRUE;
 break;
 }
 }
 if (in_conflict) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (decl, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }
 if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (imt_method, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }

 /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[mono] Fix diamond pattern encountered with static virtual interface methods by BrzVlad · Pull Request #69738 · dotnet/runtime · GitHub
Skip to content
[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

 Merged

BrzVlad
merged 3 commits into

from

May 31, 2022
 Merged


[mono] Fix diamond pattern encountered with static virtual interface methods
#69738
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
e2165fc

[mono][mini] Throw exception if we have conflicts with static virtual…


BrzVlad May 24, 2022
d8dd4e9

[mono][interp] Throw exception if we have conflicts with static virtu…


BrzVlad May 24, 2022
e8367e2

[mono][mini] Fix method access check during ldftn


BrzVlad May 24, 2022

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


18 changes: 18 additions & 0 deletions
src/mono/mono/metadata/class-accessors.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
	return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
	GSList *l = mono_class_get_dim_conflicts (klass);
	MonoMethod *decl = method;

	if (decl->is_inflated)
 decl = ((MonoMethodInflated*)decl)->declaring;

	while (l) {
 if (decl == l->data)
 return TRUE;
 l = l->next;
	}

	return FALSE;
}

typedef struct {
	MonoPropertyBagItem head;

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/class-internals.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/metadata/jit-icall-reg.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down

41 changes: 11 additions & 30 deletions
src/mono/mono/mini/interp/transform.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
	MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
	td->last_ins->info.call_args = NULL;
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	// Allocate a dummy local to serve as dreg for this instruction
	push_simple_type (td, STACK_TYPE_I4);
	td->sp--;
	interp_ins_set_dreg (td->last_ins, td->sp [0].local);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
	} else if (in_corlib &&
 (!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
 !strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
	}

	return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
 g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
 MonoMethod *virt_method = target_method;
 target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
 g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
 }

 return_val_if_nok (error, FALSE);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 mono_class_setup_vtable (target_method->klass);

 // Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

	if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
 if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
 else
 is_virtual = TRUE;
	}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 m = mono_marshal_get_synchronized_wrapper (m);

 if (constrained_class) {
 MonoMethod *virt_method = m;
 m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
 goto_if_nok (error, exit);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 constrained_class = NULL;
 }

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 mono_method_has_unmanaged_callers_only_attribute (m))) {

 if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
 interp_add_ins (td, MINT_LDNULL);
 push_simple_type (td, STACK_TYPE_MP);
 interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/mono/mini/jit-icalls.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
	return d;
}

void
mono_throw_ambiguous_implementation (void)
{
	ERROR_DECL (error);
	mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
	mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down

2 changes: 2 additions & 0 deletions
src/mono/mono/mini/jit-icalls.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down

18 changes: 12 additions & 6 deletions
src/mono/mono/mini/method-to-ir.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
 CHECK_CFG_ERROR;

 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

 if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
 /* Use the corresponding method from the base type to avoid boxing */
 MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 MonoMethod *cil_method;
 gboolean gshared_static_virtual = FALSE;

 cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
 CHECK_CFG_ERROR;

 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 if (constrained_class) {
 if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
 gshared_static_virtual = TRUE;
 } else {
 cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
 constrained_class = NULL;
 CHECK_CFG_ERROR;
 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
 constrained_class = NULL;
 }
 } else {
 // we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

 context_used = mini_method_check_context_used (cfg, cmethod);

 cil_method = cmethod;
 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 const gboolean has_unmanaged_callers_only =
 cmethod->wrapper_type == MONO_WRAPPER_NONE &&
 mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/mini-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
	register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
	register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down

30 changes: 7 additions & 23 deletions
src/mono/mono/mini/mini-trampolines.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
 vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
 return_val_if_nok (error, NULL);

 if (mono_class_has_dim_conflicts (vt->klass)) {
 GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
 GSList *l;
 MonoMethod *decl = imt_method;

 if (decl->is_inflated)
 decl = mono_method_get_declaring_generic_method (decl);

 gboolean in_conflict = FALSE;
 for (l = conflicts; l; l = l->next) {
 if (decl == l->data) {
 in_conflict = TRUE;
 break;
 }
 }
 if (in_conflict) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (decl, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }
 if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (imt_method, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }

 /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[mono] Fix diamond pattern encountered with static virtual interface methods by BrzVlad · Pull Request #69738 · dotnet/runtime · GitHub
Skip to content
[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

 Merged

BrzVlad
merged 3 commits into

from

May 31, 2022
 Merged


[mono] Fix diamond pattern encountered with static virtual interface methods
#69738
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
e2165fc

[mono][mini] Throw exception if we have conflicts with static virtual…


BrzVlad May 24, 2022
d8dd4e9

[mono][interp] Throw exception if we have conflicts with static virtu…


BrzVlad May 24, 2022
e8367e2

[mono][mini] Fix method access check during ldftn


BrzVlad May 24, 2022

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


18 changes: 18 additions & 0 deletions
src/mono/mono/metadata/class-accessors.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
	return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
	GSList *l = mono_class_get_dim_conflicts (klass);
	MonoMethod *decl = method;

	if (decl->is_inflated)
 decl = ((MonoMethodInflated*)decl)->declaring;

	while (l) {
 if (decl == l->data)
 return TRUE;
 l = l->next;
	}

	return FALSE;
}

typedef struct {
	MonoPropertyBagItem head;

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/class-internals.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/metadata/jit-icall-reg.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down

41 changes: 11 additions & 30 deletions
src/mono/mono/mini/interp/transform.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
	MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
	td->last_ins->info.call_args = NULL;
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	// Allocate a dummy local to serve as dreg for this instruction
	push_simple_type (td, STACK_TYPE_I4);
	td->sp--;
	interp_ins_set_dreg (td->last_ins, td->sp [0].local);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
	} else if (in_corlib &&
 (!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
 !strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
	}

	return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
 g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
 MonoMethod *virt_method = target_method;
 target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
 g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
 }

 return_val_if_nok (error, FALSE);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 mono_class_setup_vtable (target_method->klass);

 // Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

	if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
 if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
 else
 is_virtual = TRUE;
	}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 m = mono_marshal_get_synchronized_wrapper (m);

 if (constrained_class) {
 MonoMethod *virt_method = m;
 m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
 goto_if_nok (error, exit);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 constrained_class = NULL;
 }

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 mono_method_has_unmanaged_callers_only_attribute (m))) {

 if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
 interp_add_ins (td, MINT_LDNULL);
 push_simple_type (td, STACK_TYPE_MP);
 interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/mono/mini/jit-icalls.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
	return d;
}

void
mono_throw_ambiguous_implementation (void)
{
	ERROR_DECL (error);
	mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
	mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down

2 changes: 2 additions & 0 deletions
src/mono/mono/mini/jit-icalls.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down

18 changes: 12 additions & 6 deletions
src/mono/mono/mini/method-to-ir.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
 CHECK_CFG_ERROR;

 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

 if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
 /* Use the corresponding method from the base type to avoid boxing */
 MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 MonoMethod *cil_method;
 gboolean gshared_static_virtual = FALSE;

 cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
 CHECK_CFG_ERROR;

 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 if (constrained_class) {
 if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
 gshared_static_virtual = TRUE;
 } else {
 cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
 constrained_class = NULL;
 CHECK_CFG_ERROR;
 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
 constrained_class = NULL;
 }
 } else {
 // we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

 context_used = mini_method_check_context_used (cfg, cmethod);

 cil_method = cmethod;
 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 const gboolean has_unmanaged_callers_only =
 cmethod->wrapper_type == MONO_WRAPPER_NONE &&
 mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/mini-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
	register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
	register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down

30 changes: 7 additions & 23 deletions
src/mono/mono/mini/mini-trampolines.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
 vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
 return_val_if_nok (error, NULL);

 if (mono_class_has_dim_conflicts (vt->klass)) {
 GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
 GSList *l;
 MonoMethod *decl = imt_method;

 if (decl->is_inflated)
 decl = mono_method_get_declaring_generic_method (decl);

 gboolean in_conflict = FALSE;
 for (l = conflicts; l; l = l->next) {
 if (decl == l->data) {
 in_conflict = TRUE;
 break;
 }
 }
 if (in_conflict) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (decl, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }
 if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (imt_method, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }

 /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[mono] Fix diamond pattern encountered with static virtual interface methods by BrzVlad · Pull Request #69738 · dotnet/runtime · GitHub
Skip to content
[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

 Merged

BrzVlad
merged 3 commits into

from

May 31, 2022
 Merged


[mono] Fix diamond pattern encountered with static virtual interface methods
#69738
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
e2165fc

[mono][mini] Throw exception if we have conflicts with static virtual…


BrzVlad May 24, 2022
d8dd4e9

[mono][interp] Throw exception if we have conflicts with static virtu…


BrzVlad May 24, 2022
e8367e2

[mono][mini] Fix method access check during ldftn


BrzVlad May 24, 2022

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


18 changes: 18 additions & 0 deletions
src/mono/mono/metadata/class-accessors.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
	return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
	GSList *l = mono_class_get_dim_conflicts (klass);
	MonoMethod *decl = method;

	if (decl->is_inflated)
 decl = ((MonoMethodInflated*)decl)->declaring;

	while (l) {
 if (decl == l->data)
 return TRUE;
 l = l->next;
	}

	return FALSE;
}

typedef struct {
	MonoPropertyBagItem head;

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/class-internals.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/metadata/jit-icall-reg.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down

41 changes: 11 additions & 30 deletions
src/mono/mono/mini/interp/transform.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
	MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
	td->last_ins->info.call_args = NULL;
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	// Allocate a dummy local to serve as dreg for this instruction
	push_simple_type (td, STACK_TYPE_I4);
	td->sp--;
	interp_ins_set_dreg (td->last_ins, td->sp [0].local);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
	} else if (in_corlib &&
 (!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
 !strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
	}

	return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
 g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
 MonoMethod *virt_method = target_method;
 target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
 g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
 }

 return_val_if_nok (error, FALSE);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 mono_class_setup_vtable (target_method->klass);

 // Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

	if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
 if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
 else
 is_virtual = TRUE;
	}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 m = mono_marshal_get_synchronized_wrapper (m);

 if (constrained_class) {
 MonoMethod *virt_method = m;
 m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
 goto_if_nok (error, exit);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 constrained_class = NULL;
 }

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 mono_method_has_unmanaged_callers_only_attribute (m))) {

 if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
 interp_add_ins (td, MINT_LDNULL);
 push_simple_type (td, STACK_TYPE_MP);
 interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/mono/mini/jit-icalls.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
	return d;
}

void
mono_throw_ambiguous_implementation (void)
{
	ERROR_DECL (error);
	mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
	mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down

2 changes: 2 additions & 0 deletions
src/mono/mono/mini/jit-icalls.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down

18 changes: 12 additions & 6 deletions
src/mono/mono/mini/method-to-ir.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
 CHECK_CFG_ERROR;

 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

 if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
 /* Use the corresponding method from the base type to avoid boxing */
 MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 MonoMethod *cil_method;
 gboolean gshared_static_virtual = FALSE;

 cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
 CHECK_CFG_ERROR;

 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 if (constrained_class) {
 if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
 gshared_static_virtual = TRUE;
 } else {
 cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
 constrained_class = NULL;
 CHECK_CFG_ERROR;
 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
 constrained_class = NULL;
 }
 } else {
 // we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

 context_used = mini_method_check_context_used (cfg, cmethod);

 cil_method = cmethod;
 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 const gboolean has_unmanaged_callers_only =
 cmethod->wrapper_type == MONO_WRAPPER_NONE &&
 mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/mini-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
	register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
	register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down

30 changes: 7 additions & 23 deletions
src/mono/mono/mini/mini-trampolines.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
 vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
 return_val_if_nok (error, NULL);

 if (mono_class_has_dim_conflicts (vt->klass)) {
 GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
 GSList *l;
 MonoMethod *decl = imt_method;

 if (decl->is_inflated)
 decl = mono_method_get_declaring_generic_method (decl);

 gboolean in_conflict = FALSE;
 for (l = conflicts; l; l = l->next) {
 if (decl == l->data) {
 in_conflict = TRUE;
 break;
 }
 }
 if (in_conflict) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (decl, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }
 if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (imt_method, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }

 /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[mono] Fix diamond pattern encountered with static virtual interface methods by BrzVlad · Pull Request #69738 · dotnet/runtime · GitHub
Skip to content
[mono] Fix diamond pattern encountered with static virtual interface methods#69738

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

 Merged

BrzVlad
merged 3 commits into

from

May 31, 2022
 Merged


[mono] Fix diamond pattern encountered with static virtual interface methods
#69738
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
e2165fc

[mono][mini] Throw exception if we have conflicts with static virtual…


BrzVlad May 24, 2022
d8dd4e9

[mono][interp] Throw exception if we have conflicts with static virtu…


BrzVlad May 24, 2022
e8367e2

[mono][mini] Fix method access check during ldftn


BrzVlad May 24, 2022

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


18 changes: 18 additions & 0 deletions
src/mono/mono/metadata/class-accessors.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -497,6 +497,24 @@ mono_class_has_dim_conflicts (MonoClass *klass)
	return FALSE;
}

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method)
{
	GSList *l = mono_class_get_dim_conflicts (klass);
	MonoMethod *decl = method;

	if (decl->is_inflated)
 decl = ((MonoMethodInflated*)decl)->declaring;

	while (l) {
 if (decl == l->data)
 return TRUE;
 l = l->next;
	}

	return FALSE;
}

typedef struct {
	MonoPropertyBagItem head;

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/class-internals.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1393,6 +1393,9 @@ mono_class_get_weak_bitmap (MonoClass *klass, int *nbits);
gboolean
mono_class_has_dim_conflicts (MonoClass *klass);

gboolean
mono_class_is_method_ambiguous (MonoClass *klass, MonoMethod *method);

void
mono_class_set_dim_conflicts (MonoClass *klass, GSList *conflicts);

Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/metadata/jit-icall-reg.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,7 @@ MONO_JIT_ICALL (mono_threads_exit_gc_unsafe_region_unbalanced) \
MONO_JIT_ICALL (mono_threads_state_poll) \
MONO_JIT_ICALL (mono_throw_exception) \
MONO_JIT_ICALL (mono_throw_method_access) \
MONO_JIT_ICALL (mono_throw_ambiguous_implementation) \
MONO_JIT_ICALL (mono_throw_bad_image) \
MONO_JIT_ICALL (mono_throw_not_supported) \
MONO_JIT_ICALL (mono_throw_platform_not_supported) \
Expand Down

41 changes: 11 additions & 30 deletions
src/mono/mono/mini/interp/transform.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1197,9 +1197,9 @@ interp_generate_mae_throw (TransformData *td, MonoMethod *method, MonoMethod *ta
}

static void
interp_generate_bie_throw (TransformData *td)
interp_generate_void_throw (TransformData *td, MonoJitICallId icall_id)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_bad_image;
	MonoJitICallInfo *info = mono_find_jit_icall_info (icall_id);

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
Expand All@@ -1208,31 +1208,6 @@ interp_generate_bie_throw (TransformData *td)
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	interp_ins_set_sreg (td->last_ins, MINT_CALL_ARGS_SREG);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
	td->last_ins->info.call_args = NULL;
	td->last_ins->flags |= INTERP_INST_FLAG_CALL;
}

static void
interp_generate_platform_not_supported_throw (TransformData *td)
{
	MonoJitICallInfo *info = &mono_get_jit_icall_info ()->mono_throw_platform_not_supported;

	interp_add_ins (td, MINT_ICALL_V_V);
	// Allocate a dummy local to serve as dreg for this instruction
	push_simple_type (td, STACK_TYPE_I4);
	td->sp--;
	interp_ins_set_dreg (td->last_ins, td->sp [0].local);
	td->last_ins->data [0] = get_data_item_index (td, (gpointer)info->func);
}

static void
interp_generate_ipe_throw_with_msg (TransformData *td, MonoError *error_msg)
{
Expand DownExpand Up@@ -2406,7 +2381,7 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
	} else if (in_corlib &&
 (!strncmp ("System.Runtime.Intrinsics.Arm", klass_name_space, 29) ||
 !strncmp ("System.Runtime.Intrinsics.X86", klass_name_space, 29))) {
interp_generate_platform_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_platform_not_supported);
	}

	return FALSE;
Expand DownExpand Up@@ -3039,6 +3014,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
#if DEBUG_INTERP
 g_print ("CONSTRAINED.CALLVIRT: %s::%s. %s (%p) ->\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
#endif
 MonoMethod *virt_method = target_method;
 target_method = mono_get_method_constrained_with_method (image, target_method, constrained_class, generic_context, error);
#if DEBUG_INTERP
 g_print (" : %s::%s. %s (%p)\n", target_method->klass->name, target_method->name, mono_signature_full_name (target_method->signature), target_method);
Expand All@@ -3050,6 +3026,8 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
 }

 return_val_if_nok (error, FALSE);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 mono_class_setup_vtable (target_method->klass);

 // Follow the rules for constrained calls from ECMA spec
Expand DownExpand Up@@ -3082,7 +3060,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target

	if (!is_virtual && target_method && (target_method->flags & METHOD_ATTRIBUTE_ABSTRACT) && !m_method_is_static (target_method)) {
 if (!mono_class_is_interface (method->klass))
interp_generate_bie_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_bad_image);
 else
 is_virtual = TRUE;
	}
Expand DownExpand Up@@ -7071,8 +7049,11 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 m = mono_marshal_get_synchronized_wrapper (m);

 if (constrained_class) {
 MonoMethod *virt_method = m;
 m = mono_get_method_constrained_with_method (image, m, constrained_class, generic_context, error);
 goto_if_nok (error, exit);
 if (mono_class_has_dim_conflicts (constrained_class) && mono_class_is_method_ambiguous (constrained_class, virt_method))
 interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_ambiguous_implementation);
 constrained_class = NULL;
 }

Expand All@@ -7081,7 +7062,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
 mono_method_has_unmanaged_callers_only_attribute (m))) {

 if (m->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
interp_generate_not_supported_throw (td);
interp_generate_void_throw (td, MONO_JIT_ICALL_mono_throw_not_supported);
 interp_add_ins (td, MINT_LDNULL);
 push_simple_type (td, STACK_TYPE_MP);
 interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/mono/mini/jit-icalls.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1604,6 +1604,14 @@ mono_ckfinite (double d)
	return d;
}

void
mono_throw_ambiguous_implementation (void)
{
	ERROR_DECL (error);
	mono_error_set_ambiguous_implementation (error, "Ambiguous implementation found");
	mono_error_set_pending_exception (error);
}

void
mono_throw_method_access (MonoMethod *caller, MonoMethod *callee)
{
Expand Down

2 changes: 2 additions & 0 deletions
src/mono/mono/mini/jit-icalls.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,8 @@ ICALL_EXPORT double mono_ckfinite (double d);

ICALL_EXPORT void mono_throw_method_access (MonoMethod *caller, MonoMethod *callee);

ICALL_EXPORT void mono_throw_ambiguous_implementation (void);

ICALL_EXPORT void mono_throw_bad_image (void);

ICALL_EXPORT void mono_throw_not_supported (void);
Expand Down

18 changes: 12 additions & 6 deletions
src/mono/mono/mini/method-to-ir.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7460,6 +7460,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 cmethod = get_constrained_method (cfg, image, token, cil_method, constrained_class, generic_context);
 CHECK_CFG_ERROR;

 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);

 if (m_class_is_enumtype (constrained_class) && !strcmp (cmethod->name, "GetHashCode")) {
 /* Use the corresponding method from the base type to avoid boxing */
 MonoType *base_type = mono_class_enum_basetype_internal (constrained_class);
Expand DownExpand Up@@ -11321,16 +11325,22 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 MonoMethod *cil_method;
 gboolean gshared_static_virtual = FALSE;

 cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
cil_method = cmethod = mini_get_method (cfg, method, n, NULL, generic_context);
 CHECK_CFG_ERROR;

 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 if (constrained_class) {
 if (m_method_is_static (cmethod) && mini_class_check_context_used (cfg, constrained_class)) {
 gshared_static_virtual = TRUE;
 } else {
 cmethod = get_constrained_method (cfg, image, n, cmethod, constrained_class, generic_context);
 constrained_class = NULL;
 CHECK_CFG_ERROR;
 if (mono_class_has_dim_conflicts (constrained_class) &&
 mono_class_is_method_ambiguous (constrained_class, cil_method))
 mono_emit_jit_icall (cfg, mono_throw_ambiguous_implementation, NULL);
 constrained_class = NULL;
 }
 } else {
 // we can't save token info if we have a constrained_class since
Expand All@@ -11342,10 +11352,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b

 context_used = mini_method_check_context_used (cfg, cmethod);

 cil_method = cmethod;
 if (!dont_verify && !cfg->skip_visibility && !mono_method_can_access_method (method, cmethod))
 emit_method_access_failure (cfg, method, cil_method);

 const gboolean has_unmanaged_callers_only =
 cmethod->wrapper_type == MONO_WRAPPER_NONE &&
 mono_method_has_unmanaged_callers_only_attribute (cmethod);
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/mini-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4952,6 +4952,7 @@ register_icalls (void)
	register_icall (mono_get_assembly_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_get_method_object, mono_icall_sig_object_ptr, TRUE);
	register_icall (mono_throw_method_access, mono_icall_sig_void_ptr_ptr, FALSE);
	register_icall (mono_throw_ambiguous_implementation, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_bad_image, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_not_supported, mono_icall_sig_void, FALSE);
	register_icall (mono_throw_platform_not_supported, mono_icall_sig_void, FALSE);
Expand Down

30 changes: 7 additions & 23 deletions
src/mono/mono/mini/mini-trampolines.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -468,29 +468,13 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
 vtable_slot = mini_resolve_imt_method (vt, vtable_slot, imt_method, &impl_method, &addr, &need_rgctx_tramp, &variant_iface, error);
 return_val_if_nok (error, NULL);

 if (mono_class_has_dim_conflicts (vt->klass)) {
 GSList *conflicts = mono_class_get_dim_conflicts (vt->klass);
 GSList *l;
 MonoMethod *decl = imt_method;

 if (decl->is_inflated)
 decl = mono_method_get_declaring_generic_method (decl);

 gboolean in_conflict = FALSE;
 for (l = conflicts; l; l = l->next) {
 if (decl == l->data) {
 in_conflict = TRUE;
 break;
 }
 }
 if (in_conflict) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (decl, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }
 if (mono_class_has_dim_conflicts (vt->klass) && mono_class_is_method_ambiguous (vt->klass, imt_method)) {
 char *class_name = mono_class_full_name (vt->klass);
 char *method_name = mono_method_full_name (imt_method, TRUE);
 mono_error_set_ambiguous_implementation (error, "Could not call method '%s' with type '%s' because there are multiple incompatible interface methods overriding this method.", method_name, class_name);
 g_free (class_name);
 g_free (method_name);
 return NULL;
 }

 /* We must handle magic interfaces on rank 1 arrays of ref types as if they were variant */
Expand Down