diff --git a/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs b/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs index d623f8c6ae..84bcd19215 100644 --- a/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs +++ b/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs @@ -338,6 +338,12 @@ public async Task AnonymousTypes([ValueSource(nameof(defaultOptionsWithMcs))] Co await RunForLibrary(cscOptions: cscOptions); } + [Test] + public async Task StringConcatenation([ValueSource(nameof(roslyn3OrNewerOptions))] CompilerOptions cscOptions) + { + await RunForLibrary(cscOptions: cscOptions); + } + [Test] public async Task Async([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions) { diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/StringConcatenation.cs b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/StringConcatenation.cs new file mode 100644 index 0000000000..be207bdad5 --- /dev/null +++ b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/StringConcatenation.cs @@ -0,0 +1,35 @@ +// Copyright (c) 2026 Sebastien Lebreton +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this +// software and associated documentation files (the "Software"), to deal in the Software +// without restriction, including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or +// substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +using System; + +namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty +{ + public static class StringConcatenation + { + public static string WithSpan(Span value) + { + return "prefix" + value.ToString(); + } + + public static string WithReadOnlySpan(ReadOnlySpan value) + { + return "prefix" + value.ToString(); + } + } +} diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs b/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs index 0fecc7cb47..6136ec4963 100644 --- a/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs +++ b/ICSharpCode.Decompiler/CSharp/Transforms/ReplaceMethodCallsWithOperators.cs @@ -366,6 +366,11 @@ internal static Expression RemoveRedundantToStringInConcat(Expression expr, IMet var toStringMethod = m.Get("call").Single().GetSymbol() as IMethod; var target = m.Get("target").Single(); var type = target.GetResolveResult().Type; + if (type.IsByRefLike) + { + // ref structs cannot be converted to object for use with + + return expr; + } if (!(isLastArgument || ToStringIsKnownEffectFree(type))) { // ToString() order of evaluation matters, see CheckArgumentsForStringConcat().