Browse Source

Merge branch 'dev/andrewau/1224' of https://github.com/cshung/ILSpy into cshung-dev/andrewau/1224

pull/1243/head
Siegfried Pammer 8 years ago
parent
commit
5a4d4958c8
  1. 6
      ICSharpCode.Decompiler/IL/Transforms/TransformExpressionTrees.cs

6
ICSharpCode.Decompiler/IL/Transforms/TransformExpressionTrees.cs

@ -660,7 +660,11 @@ namespace ICSharpCode.Decompiler.IL.Transforms
if (target == null) { if (target == null) {
return (new LdObj(new LdsFlda((IField)member), member.ReturnType), member.ReturnType); return (new LdObj(new LdsFlda((IField)member), member.ReturnType), member.ReturnType);
} else { } else {
return (new LdObj(new LdFlda(target, (IField)member), member.ReturnType), member.ReturnType); if (member.DeclaringType.IsReferenceType == true) {
return (new LdObj(new LdFlda(target, (IField)member), member.ReturnType), member.ReturnType);
} else {
return (new LdObj(new LdFlda(new AddressOf(target), (IField)member), member.ReturnType), member.ReturnType);
}
} }
} }

Loading…
Cancel
Save