Skip to content

Commit 9dfec6c

Browse files
daxian-dbwiSazonov
daxian-dbw
authored and
iSazonov
committed
Remove dead code about 'IsTransparentProxy' (#9966)
1 parent 482c64b commit 9dfec6c

File tree

3 files changed

+42
-63
lines changed

3 files changed

+42
-63
lines changed

‎src/System.Management.Automation/engine/parser/Parser.cs‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4370,49 +4370,49 @@ private MemberAst ClassMemberRule(string className, out List<Ast> astsOnError)
43704370
switch (token.Kind)
43714371
{
43724372
#if SUPPORT_PUBLIC_PRIVATE
4373-
case TokenKind.Public:
4374-
if (publicToken != null)
4375-
{
4376-
ReportError(token.Extent,
4377-
nameof(ParserStrings.DuplicateQualifier),
4378-
ParserStrings.DuplicateQualifier,
4379-
token.Text);
4380-
}
4373+
case TokenKind.Public:
4374+
if (publicToken != null)
4375+
{
4376+
ReportError(token.Extent,
4377+
nameof(ParserStrings.DuplicateQualifier),
4378+
ParserStrings.DuplicateQualifier,
4379+
token.Text);
4380+
}
43814381

4382-
if (privateToken != null)
4383-
{
4384-
ReportError(token.Extent,
4385-
nameof(ParserStrings.ModifiersCannotBeCombined),
4386-
ParserStrings.ModifiersCannotBeCombined,
4387-
privateToken.Text,
4388-
token.Text);
4389-
}
4382+
if (privateToken != null)
4383+
{
4384+
ReportError(token.Extent,
4385+
nameof(ParserStrings.ModifiersCannotBeCombined),
4386+
ParserStrings.ModifiersCannotBeCombined,
4387+
privateToken.Text,
4388+
token.Text);
4389+
}
43904390

4391-
publicToken = token;
4392-
SkipToken();
4393-
break;
4391+
publicToken = token;
4392+
SkipToken();
4393+
break;
43944394

4395-
case TokenKind.Private:
4396-
if (privateToken != null)
4397-
{
4398-
ReportError(token.Extent,
4399-
nameof(ParserStrings.DuplicateQualifier),
4400-
ParserStrings.DuplicateQualifier,
4401-
token.Text);
4402-
}
4395+
case TokenKind.Private:
4396+
if (privateToken != null)
4397+
{
4398+
ReportError(token.Extent,
4399+
nameof(ParserStrings.DuplicateQualifier),
4400+
ParserStrings.DuplicateQualifier,
4401+
token.Text);
4402+
}
44034403

4404-
if (publicToken != null)
4405-
{
4406-
ReportError(token.Extent,
4407-
nameof(ParserStrings.ModifiersCannotBeCombined),
4408-
ParserStrings.ModifiersCannotBeCombined,
4409-
publicToken.Text,
4410-
token.Text);
4411-
}
4404+
if (publicToken != null)
4405+
{
4406+
ReportError(token.Extent,
4407+
nameof(ParserStrings.ModifiersCannotBeCombined),
4408+
ParserStrings.ModifiersCannotBeCombined,
4409+
publicToken.Text,
4410+
token.Text);
4411+
}
44124412

4413-
privateToken = token;
4414-
SkipToken();
4415-
break;
4413+
privateToken = token;
4414+
SkipToken();
4415+
break;
44164416
#endif
44174417

44184418
case TokenKind.Hidden:
@@ -4529,7 +4529,7 @@ private MemberAst ClassMemberRule(string className, out List<Ast> astsOnError)
45294529
return null;
45304530
}
45314531

4532-
#if FALSE
4532+
#if SUPPORT_PUBLIC_PRIVATE
45334533
MethodAttributes attributes = privateToken != null ? MethodAttributes.Private : MethodAttributes.Public;
45344534
#else
45354535
MethodAttributes attributes = MethodAttributes.Public;

‎src/System.Management.Automation/engine/runtime/Binding/Binders.cs‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ internal static DynamicMetaObject WriteToDebugLog(this DynamicMetaObject obj, Dy
7979

8080
internal static BindingRestrictions GetSimpleTypeRestriction(this DynamicMetaObject obj)
8181
{
82-
if (obj.Value == null || ClrFacade.IsTransparentProxy(obj.Value))
82+
if (obj.Value == null)
8383
{
8484
return BindingRestrictions.GetInstanceRestriction(obj.Expression, obj.Value);
8585
}
@@ -132,7 +132,7 @@ internal static BindingRestrictions PSGetStaticMemberRestriction(this DynamicMet
132132
return obj.Restrictions;
133133
}
134134

135-
if (obj.Value == null || ClrFacade.IsTransparentProxy(obj.Value))
135+
if (obj.Value == null)
136136
{
137137
return BindingRestrictions.GetInstanceRestriction(obj.Expression, obj.Value);
138138
}
@@ -187,7 +187,7 @@ internal static BindingRestrictions PSGetTypeRestriction(this DynamicMetaObject
187187
return obj.Restrictions;
188188
}
189189

190-
if (obj.Value == null || ClrFacade.IsTransparentProxy(obj.Value))
190+
if (obj.Value == null)
191191
{
192192
return BindingRestrictions.GetInstanceRestriction(obj.Expression, obj.Value);
193193
}
@@ -6878,14 +6878,6 @@ internal static DynamicMetaObject InvokeDotNetMethod(
68786878
argValues[i] = arg == AutomationNull.Value ? null : arg;
68796879
}
68806880

6881-
if (ClrFacade.IsTransparentProxy(target.Value) && (psMethodInvocationConstraints == null || psMethodInvocationConstraints.MethodTargetType == null))
6882-
{
6883-
var argTypes = (psMethodInvocationConstraints == null)
6884-
? new Type[numArgs]
6885-
: psMethodInvocationConstraints.ParameterTypes.ToArray();
6886-
psMethodInvocationConstraints = new PSMethodInvocationConstraints(target.Value.GetType(), argTypes);
6887-
}
6888-
68896881
var result = Adapter.FindBestMethod(
68906882
mi,
68916883
psMethodInvocationConstraints,

‎src/System.Management.Automation/utils/ClrFacade.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,6 @@ private static SecurityZone ReadFromZoneIdentifierDataStream(string filePath)
280280

281281
#region Misc
282282

283-
/// <summary>
284-
/// Facade for RemotingServices.IsTransparentProxy(object)
285-
/// </summary>
286-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
287-
internal static bool IsTransparentProxy(object obj)
288-
{
289-
#if CORECLR // Namespace System.Runtime.Remoting is not in CoreCLR
290-
return false;
291-
#else
292-
return System.Runtime.Remoting.RemotingServices.IsTransparentProxy(obj);
293-
#endif
294-
}
295-
296283
/// <summary>
297284
/// Facade for ManagementDateTimeConverter.ToDmtfDateTime(DateTime)
298285
/// </summary>

0 commit comments

Comments
 (0)