Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ private static void SetResult( List<Expression> expressions, StateMachineContext
{
var lastExpression = expressions[^1];

if ( variable.Type.IsAssignableFrom( lastExpression.Type ) )
if ( variable.Type.IsAssignableFrom( lastExpression.Type ) &&
( variable.Type != typeof( object ) || !lastExpression.Type.IsValueType ) )
{
expressions[^1] = Assign( variable, lastExpression );
}
Expand Down
27 changes: 27 additions & 0 deletions test/Hyperbee.Expressions.Tests/BlockAsyncBasicTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -718,4 +718,31 @@ public async Task BlockAsync_ShouldAwaitSuccessfully_WithNestedLambdaArgument( C
// Assert
Assert.AreEqual( 3, result );
}

[TestMethod]
[DataRow( CompilerType.Fast )]
[DataRow( CompilerType.System )]
[Description("Issue: https://github.com/Stillpoint-Software/hyperbee.expressions/issues/126")]
public async Task BlockAsync_DoesNotAssignVariableForSetResultWhenBoxingIsRequired( CompilerType compiler )
{
// Arrange
var expected = new object();
var variable = Variable(typeof(int));

var lambda = Lambda<Func<Task<object>>>(
BlockAsync(
[variable],
Assign( variable, Constant( 0 ) ),
Await( Constant( Task.FromResult( expected ) ) )
)
);

// Act
var method = lambda.Compile( compiler );

var result = await method();

// Assert
Assert.AreSame( expected, result );
}
}