MethodUsedByAnalyzer: Fix detection of usages in expression trees.

icsharpcode · Aug 9, 2018 · c753b65 · c753b65
1 parent 822f358
commit c753b65
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/ILSpy/Analyzers/Builtin/MethodUsedByAnalyzer.cs b/ILSpy/Analyzers/Builtin/MethodUsedByAnalyzer.cs
@@ -99,7 +99,7 @@ static bool ScanMethodBody(IMethod analyzedMethod, IMethod method, MethodBodyBlo
 				ILOpCode opCode;
 				try {
 					opCode = blob.DecodeOpCode();
-					if (opCode != ILOpCode.Call && opCode != ILOpCode.Callvirt) {
+					if (opCode != ILOpCode.Call && opCode != ILOpCode.Callvirt && opCode != ILOpCode.Ldtoken) {
 						ILParser.SkipOperand(ref blob, opCode);
 						continue;
 					}
@@ -118,16 +118,14 @@ static bool ScanMethodBody(IMethod analyzedMethod, IMethod method, MethodBodyBlo
 				if (m == null)
 					continue;
 
-				if (opCode == ILOpCode.Call) {
-					if (IsSameMember(analyzedMethod, m)) {
-						return true;
-					}
-				}
-
 				if (opCode == ILOpCode.Callvirt && baseMethod != null) {
 					if (IsSameMember(baseMethod, m)) {
 						return true;
 					}
+				} else {
+					if (IsSameMember(analyzedMethod, m)) {
+						return true;
+					}
 				}
 			}