Fix #2053: Assert and NRE in LocalFunctionDecompiler

icsharpcode · Jun 30, 2020 · 74101ff · 74101ff
1 parent 6d70978
commit 74101ff
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ICSharpCode.Decompiler/IL/Transforms/LocalFunctionDecompiler.cs b/ICSharpCode.Decompiler/IL/Transforms/LocalFunctionDecompiler.cs
@@ -102,7 +102,8 @@ private void ReplaceReferencesToDisplayClassThis(Dictionary<MethodDefinitionHand
 				if (thisVar == null)
 					continue;
 				var compatibleArgument = FindCompatibleArgument(info, info.UseSites.SelectArray(u => u.Arguments[0]), ignoreStructure: true);
-				Debug.Assert(compatibleArgument != null);
+				if (compatibleArgument == null)
+					continue;
 				context.Step($"Replace 'this' with {compatibleArgument}", localFunction);
 				localFunction.AcceptVisitor(new DelegateConstruction.ReplaceDelegateTargetVisitor(compatibleArgument, thisVar));
 				DetermineCaptureAndDeclarationScope(info, -1, compatibleArgument);
@@ -208,7 +209,8 @@ private void PropagateClosureParameterArguments(Dictionary<MethodDefinitionHandl
 						if (targetVariable == null)
 							continue;
 						var compatibleArgument = FindCompatibleArgument(info, arguments);
-						Debug.Assert(compatibleArgument != null);
+						if (compatibleArgument == null)
+							continue;
 						context.Step($"Replace '{targetVariable}' with '{compatibleArgument}'", info.Definition);
 						info.Definition.AcceptVisitor(new DelegateConstruction.ReplaceDelegateTargetVisitor(compatibleArgument, targetVariable));
 					}