diff --git a/TestSuite/l2.dll b/TestSuite/l2.dll new file mode 100644 index 000000000..7bb7a45a6 Binary files /dev/null and b/TestSuite/l2.dll differ diff --git a/TestSuite/overloads11.pas b/TestSuite/overloads11.pas new file mode 100644 index 000000000..1bd0b8bcd --- /dev/null +++ b/TestSuite/overloads11.pas @@ -0,0 +1,6 @@ +{$reference l2.dll} + +begin + l2.t2.m1; + assert(l2.t2.i = 1); +end. \ No newline at end of file diff --git a/TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs b/TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs index 1d18fbe52..d1d9cdc48 100644 --- a/TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs +++ b/TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs @@ -2233,7 +2233,13 @@ namespace PascalABCCompiler.TreeConverter } continue; } - set_of_possible_functions.Add(fn); + else if ((func = find_eq_method_in_list(fn, set_of_possible_functions)) != null) + { + if (!(fn is compiled_function_node cfn && func is compiled_function_node cfn2 && (cfn.polymorphic_state == polymorphic_state.ps_static || cfn2.polymorphic_state == polymorphic_state.ps_static))) + set_of_possible_functions.Add(fn); + } + else + set_of_possible_functions.Add(fn); } } if (parameters.Count > fn.parameters.Count)