[dlr] Emit correct code for convert of nullable types. Fixes mono#19500

jiailiuyan · May 5, 2014 · 0137058 · 0137058
1 parent dba4ec7
commit 0137058
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/LightCompiler.cs b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/LightCompiler.cs
@@ -704,10 +704,7 @@ private void CompileConvertToType(Type typeFrom, Type typeTo, bool isChecked) {
                 _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;
             }