Skip to content

M
mono

bingbingbingbing / mono
与 Fork 源项目一致

从无法访问的项目Fork

通知 35
Star 0
Fork 1
M
mono

体验新版 GitCode，发现更多精彩内容 >>

提交 9a7ff171 编写于 作者: M Marek Safar
浏览文件
操作

ref/out arguments are always of static type

上级 29281b99
隐藏空白更改
内联 并排
Showing with 144 addition and 41 deletion
mcs/mcs/argument.cs
浏览文件 @ 9a7ff171
......@@ -244,9 +244,13 @@ namespace Mono.CSharp
} else if (a.ArgType == Argument.AType.Ref) {
info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsRef", loc), loc);
info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc), loc);
} else if (a.ArgType == Argument.AType.Out) {
info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsOut", loc), loc);
info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc), loc);
} else if (a.ArgType == Argument.AType.DynamicTypeName) {
info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsStaticType", loc), loc);
......
mcs/tests/dtest-003.cs
浏览文件 @ 9a7ff171
......@@ -1021,6 +1021,23 @@ class Tester : DynamicObjectMock
d.Max<dynamic> ();
}
void InvokeMember_8 (dynamic d, DynamicObjectMock mock)
{
mock.InvokeMemberOperation = (binder, args) => {
Assert (binder.CallInfo, new CallInfo (1, new string[0]), "CallInfo");
AssertArgument (binder, new[] {
CSharpArgumentInfo.Create (CSharpArgumentInfoFlags.None, null),
CSharpArgumentInfo.Create (CSharpArgumentInfoFlags.IsRef | CSharpArgumentInfoFlags.UseCompileTimeType, null) },
"ArgumentInfo");
Assert (binder.IgnoreCase, false, "IgnoreCase");
Assert ((IList<object>) args, new object[] { 9 }, "args");
};
dynamic i = 9;
d.Max (ref i);
}
void SetIndex_1 (dynamic d, DynamicObjectMock mock)
{
......
mcs/tests/dtest-034.cs 0 → 100644
浏览文件 @ 9a7ff171
public class C
{
public void M<U, V> (out U u, ref V v)
{
u = default (U);
}
}
public class Test
{
public static int Main ()
{
dynamic u = "s";
dynamic v = 5;
dynamic c = new C ();
c.M (out u, ref v);
if (v != 5)
return 1;
if (u != null)
return 2;
return 0;
}
}
mcs/tests/ver-il-dmcs.xml
浏览文件 @ 9a7ff171
......@@ -574,15 +574,6 @@
<method name="Void &lt;InvokeMember_7&gt;m__39(System.Dynamic.InvokeMemberBinder, System.Object[])">
<size>90</size>
</method>
<method name="Void &lt;SetIndex_1&gt;m__3A(System.Dynamic.SetIndexBinder, System.Object[], System.Object)">
<size>124</size>
</method>
<method name="Void &lt;SetIndex_2&gt;m__3B(System.Dynamic.SetIndexBinder, System.Object[], System.Object)">
<size>139</size>
</method>
<method name="Void &lt;SetMember_1&gt;m__3D(System.Dynamic.SetMemberBinder, System.Object)">
<size>101</size>
</method>
</type>
<type name="Tester+&lt;InvokeMember_2&gt;c__AnonStorey3">
<method name="Void &lt;&gt;m__35(System.Dynamic.InvokeMemberBinder, System.Object[])">
......@@ -594,11 +585,6 @@
<size>119</size>
</method>
</type>
<type name="Tester+&lt;SetIndex_3&gt;c__AnonStorey5">
<method name="Void &lt;&gt;m__3C(System.Dynamic.SetIndexBinder, System.Object[], System.Object)">
<size>119</size>
</method>
</type>
<type name="Tester+&lt;InvokeMember_3&gt;c__DynamicSite30+Container0">
<method name="Void Invoke(System.Runtime.CompilerServices.CallSite, System.Object, Int32 ByRef)">
<size>0</size>
......@@ -622,83 +608,115 @@
<method name="System.Object &lt;GetMember_1&gt;m__2D(System.Dynamic.GetMemberBinder)">
<size>67</size>
</method>
<method name="Void &lt;SetMember_2&gt;m__3F(System.Dynamic.BinaryOperationBinder, System.Object)">
</type>
<type name="Tester+&lt;SetMember_2&gt;c__AnonStorey6">
<method name="Void .ctor()">
<size>7</size>
</method>
</type>
<type name="Tester">
<method name="Void InvokeMember_8(System.Object, DynamicObjectMock)">
<size>140</size>
</method>
<method name="Void &lt;InvokeMember_8&gt;m__3A(System.Dynamic.InvokeMemberBinder, System.Object[])">
<size>111</size>
</method>
<method name="Void &lt;SetIndex_1&gt;m__3B(System.Dynamic.SetIndexBinder, System.Object[], System.Object)">
<size>124</size>
</method>
<method name="Void &lt;SetIndex_2&gt;m__3C(System.Dynamic.SetIndexBinder, System.Object[], System.Object)">
<size>139</size>
</method>
<method name="Void &lt;SetMember_1&gt;m__3E(System.Dynamic.SetMemberBinder, System.Object)">
<size>101</size>
</method>
<method name="Void &lt;SetMember_2&gt;m__40(System.Dynamic.BinaryOperationBinder, System.Object)">
<size>68</size>
</method>
<method name="Void &lt;SetMember_2&gt;m__40(System.Dynamic.SetMemberBinder, System.Object)">
<method name="Void &lt;SetMember_2&gt;m__41(System.Dynamic.SetMemberBinder, System.Object)">
<size>76</size>
</method>
<method name="System.Object &lt;UnaryPlus_1&gt;m__41(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryPlus_1&gt;m__42(System.Dynamic.UnaryOperationBinder)">
<size>47</size>
</method>
<method name="System.Object &lt;UnaryMinus_1&gt;m__42(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryMinus_1&gt;m__43(System.Dynamic.UnaryOperationBinder)">
<size>47</size>
</method>
<method name="System.Object &lt;UnaryNot_1&gt;m__43(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryNot_1&gt;m__44(System.Dynamic.UnaryOperationBinder)">
<size>47</size>
</method>
<method name="System.Object &lt;UnaryOnesComplement_1&gt;m__44(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryOnesComplement_1&gt;m__45(System.Dynamic.UnaryOperationBinder)">
<size>47</size>
</method>
<method name="System.Object &lt;UnaryDecrement_1&gt;m__45(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryDecrement_1&gt;m__46(System.Dynamic.UnaryOperationBinder)">
<size>47</size>
</method>
<method name="System.Object &lt;UnaryDecrement_2&gt;m__46(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryDecrement_2&gt;m__47(System.Dynamic.UnaryOperationBinder)">
<size>51</size>
</method>
<method name="System.Object &lt;UnaryIncrement_1&gt;m__47(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryIncrement_1&gt;m__48(System.Dynamic.UnaryOperationBinder)">
<size>47</size>
</method>
<method name="System.Object &lt;UnaryIncrement_2&gt;m__48(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryIncrement_2&gt;m__49(System.Dynamic.UnaryOperationBinder)">
<size>51</size>
</method>
<method name="System.Object &lt;UnaryIsFalse_1&gt;m__49(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryIsFalse_1&gt;m__4A(System.Dynamic.UnaryOperationBinder)">
<size>52</size>
</method>
<method name="Void &lt;UnaryIsFalse_1&gt;m__4A(System.Dynamic.BinaryOperationBinder, System.Object)">
<method name="Void &lt;UnaryIsFalse_1&gt;m__4B(System.Dynamic.BinaryOperationBinder, System.Object)">
<size>68</size>
</method>
<method name="System.Object &lt;UnaryIsFalse_2&gt;m__4B(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryIsFalse_2&gt;m__4C(System.Dynamic.UnaryOperationBinder)">
<size>52</size>
</method>
<method name="Void &lt;UnaryIsFalse_2&gt;m__4C(System.Dynamic.BinaryOperationBinder, System.Object)">
<method name="Void &lt;UnaryIsFalse_2&gt;m__4D(System.Dynamic.BinaryOperationBinder, System.Object)">
<size>68</size>
</method>
<method name="System.Object &lt;UnaryIsFalse_3&gt;m__4D(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryIsFalse_3&gt;m__4E(System.Dynamic.UnaryOperationBinder)">
<size>52</size>
</method>
<method name="Void &lt;UnaryIsFalse_3&gt;m__4E(System.Dynamic.BinaryOperationBinder, System.Object)">
<method name="Void &lt;UnaryIsFalse_3&gt;m__4F(System.Dynamic.BinaryOperationBinder, System.Object)">
<size>67</size>
</method>
<method name="System.Object &lt;UnaryIsTrue_1&gt;m__4F(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryIsTrue_1&gt;m__50(System.Dynamic.UnaryOperationBinder)">
<size>52</size>
</method>
<method name="System.Object &lt;UnaryIsTrue_2&gt;m__50(System.Dynamic.UnaryOperationBinder)">
<method name="System.Object &lt;UnaryIsTrue_2&gt;m__51(System.Dynamic.UnaryOperationBinder)">
<size>52</size>
</method>
<method name="Void &lt;UnaryIsTrue_2&gt;m__51(System.Dynamic.BinaryOperationBinder, System.Object)">
<method name="Void &lt;UnaryIsTrue_2&gt;m__52(System.Dynamic.BinaryOperationBinder, System.Object)">
<size>68</size>
</method>
<method name="Boolean &lt;Main&gt;m__52(System.Reflection.MethodInfo)">
<method name="Boolean &lt;Main&gt;m__53(System.Reflection.MethodInfo)">
<size>12</size>
</method>
<method name="System.String &lt;Main&gt;m__53(System.Reflection.MethodInfo)">
<method name="System.String &lt;Main&gt;m__54(System.Reflection.MethodInfo)">
<size>7</size>
</method>
<method name="Boolean &lt;Main&gt;m__54(System.Reflection.MethodInfo)">
<method name="Boolean &lt;Main&gt;m__55(System.Reflection.MethodInfo)">
<size>7</size>
</method>
<method name="Boolean &lt;Main&gt;m__55(Boolean)">
<method name="Boolean &lt;Main&gt;m__56(Boolean)">
<size>5</size>
</method>
</type>
<type name="Tester+&lt;InvokeMember_8&gt;c__DynamicSite35+Container0">
<method name="Void Invoke(System.Runtime.CompilerServices.CallSite, System.Object, System.Object ByRef)">
<size>0</size>
</method>
<method name="Void .ctor(Object, IntPtr)">
<size>0</size>
</method>
</type>
<type name="Tester+&lt;SetIndex_3&gt;c__AnonStorey5">
<method name="Void &lt;&gt;m__3D(System.Dynamic.SetIndexBinder, System.Object[], System.Object)">
<size>119</size>
</method>
</type>
<type name="Tester+&lt;SetMember_2&gt;c__AnonStorey6">
<method name="System.Object &lt;&gt;m__3E(System.Dynamic.GetMemberBinder)">
<method name="System.Object &lt;&gt;m__3F(System.Dynamic.GetMemberBinder)">
<size>72</size>
</method>
<method name="Void .ctor()">
<size>7</size>
</method>
</type>
</test>
<test name="dtest-004.cs">
......@@ -2199,6 +2217,32 @@
</method>
</type>
</test>
<test name="dtest-034.cs">
<type name="C">
<method name="Void M[U,V](U ByRef, V ByRef)">
<size>16</size>
</method>
<method name="Void .ctor()">
<size>7</size>
</method>
</type>
<type name="Test">
<method name="Int32 Main()">
<size>464</size>
</method>
<method name="Void .ctor()">
<size>7</size>
</method>
</type>
<type name="Test+&lt;Main&gt;c__DynamicSite0+Container0">
<method name="Void Invoke(System.Runtime.CompilerServices.CallSite, System.Object, System.Object ByRef, System.Object ByRef)">
<size>0</size>
</method>
<method name="Void .ctor(Object, IntPtr)">
<size>0</size>
</method>
</type>
</test>
<test name="dtest-collectioninit-01.cs">
<type name="Test">
<method name="Int32 Main()">
......@@ -6724,6 +6768,16 @@
</method>
</type>
</test>
<test name="gtest-165.cs">
<type name="C">
<method name="Int32 Main()">
<size>27</size>
</method>
<method name="Void .ctor()">
<size>7</size>
</method>
</type>
</test>
<test name="gtest-166.cs">
<type name="C">
<method name="Void .ctor()">
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或