From 0e0179edff5d4eaa7e3856945d9830a8f19fde58 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sun, 28 Jul 2019 17:33:17 +0200
Subject: [PATCH] Improve NullPropagation (?.) when fields of value-type are
 involved.

---
 .../TestCases/Pretty/NullPropagation.cs            | 14 ++++++++++++++
 .../IL/Transforms/NullPropagationTransform.cs      |  6 ++++++
 2 files changed, 20 insertions(+)

diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs
index 9ce4066cf..98b5df626 100644
--- a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs
+++ b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs
@@ -25,6 +25,9 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
 		private class MyClass
 		{
 			public int IntVal;
+			public readonly int ReadonlyIntVal;
+			public MyStruct StructField;
+			public readonly MyStruct ReadonlyStructField;
 			public string Text;
 			public MyClass Field;
 			public MyClass Property {
@@ -45,6 +48,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
 		private struct MyStruct
 		{
 			public int IntVal;
+			public readonly int ReadonlyIntVal;
 			public MyClass Field;
 			public MyStruct? Property1 => null;
 			public MyStruct Property2 => default(MyStruct);
@@ -178,6 +182,16 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
 		{
 			Use(GetMyClass()?.Text ?? "Hello");
 		}
+		
+		public void CallOnValueTypeField()
+		{
+			Use(GetMyClass()?.IntVal.ToString());
+			Use(GetMyStruct()?.IntVal.ToString());
+			Use(GetMyClass()?.ReadonlyIntVal.ToString());
+			Use(GetMyStruct()?.ReadonlyIntVal.ToString());
+			GetMyClass()?.StructField.Done();
+			GetMyClass()?.ReadonlyStructField.Done();
+		}
 
 		public void InvokeDelegate(EventHandler eh)
 		{
diff --git a/ICSharpCode.Decompiler/IL/Transforms/NullPropagationTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/NullPropagationTransform.cs
index 675e94280..9288c447b 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/NullPropagationTransform.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/NullPropagationTransform.cs
@@ -186,6 +186,12 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 					return chainLength >= 1;
 				} else if (inst.MatchLdFld(out var target, out _)) {
 					inst = target;
+				} else if (inst.MatchLdFlda(out target, out var f)) {
+					if (target is AddressOf addressOf && f.DeclaringType.Kind == TypeKind.Struct) {
+						inst = addressOf.Value;
+					} else {
+						inst = target;
+					}
 				} else if (inst is CallInstruction call && call.OpCode != OpCode.NewObj) {
 					if (call.Arguments.Count == 0) {
 						return false;