administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bug fix for .NET 4.6: exit in except block caused runtime error

Browse source
This commit is contained in:
Бондарев Иван 2015-07-26 17:18:27 +02:00
parent cce539f4a0
commit 540394db13
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
NETGenerator/NETGenerator.cs
View file

@ -10290,7 +10290,10 @@ namespace PascalABCCompiler.NETGenerator
{
if (!ExitProcedureCall)
ExitLabel = il.DefineLabel();
il.Emit(OpCodes.Br, ExitLabel);
if (!safe_block)
il.Emit(OpCodes.Br, ExitLabel);
else
il.Emit(OpCodes.Leave, ExitLabel);
ExitProcedureCall = true;
}

2
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -1964,7 +1964,7 @@ begin
on e: System.Exception do
begin
Result := nil;
Exit;
//Exit;
end;
end;
end;