diff options
| author | Marek Safar <marek.safar@gmail.com> | 2014-05-05 21:16:11 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2014-05-05 21:16:11 +0400 |
| commit | 0137058a180ddcd5ff81427fd8e82c3239dc3934 (patch) | |
| tree | ea933c8171b5600c2ffc44a81c62940cc95f790e /mcs/class/dlr | |
| parent | dba4ec7936a08d01b587ca617e6965360a96d175 (diff) | |
[dlr] Emit correct code for convert of nullable types. Fixes #19500
Diffstat (limited to 'mcs/class/dlr')
| -rw-r--r-- | mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/LightCompiler.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/LightCompiler.cs b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/LightCompiler.cs index 61a0974e6e0..c58b0353f91 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/LightCompiler.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/LightCompiler.cs @@ -704,10 +704,7 @@ namespace Microsoft.Scripting.Interpreter { _instructions.EmitBranchNull(nullValue); CompileConvertToType (typeFrom, typeTo, isChecked); _instructions.EmitWrap (typeTo); - _instructions.EmitBranch (end); _instructions.MarkLabel(nullValue); - _instructions.EmitDup (); // Keep null on the stack - _instructions.MarkLabel(end); return; } |