Browse Source

--- Merging r31475 into '.':
U compiler/x86_64/nx64flw.pas
--- Recording mergeinfo for merge of r31475 into '.':
U .

# revisions: 31475

git-svn-id: branches/fixes_3_0@31559 -

marco 10 years ago
parent
commit
de3a3d11e2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      compiler/x86_64/nx64flw.pas

+ 2 - 2
compiler/x86_64/nx64flw.pas

@@ -509,7 +509,7 @@ procedure tx64tryexceptnode.pass_generate_code;
         cg.a_label(current_asmdata.CurrAsmList,breakexceptlabel);
         cg.a_label(current_asmdata.CurrAsmList,breakexceptlabel);
         cg.g_call(current_asmdata.CurrAsmList,'FPC_DONEEXCEPTION');
         cg.g_call(current_asmdata.CurrAsmList,'FPC_DONEEXCEPTION');
         if (fc_unwind in flowcontrol) then
         if (fc_unwind in flowcontrol) then
-          cg.g_local_unwind(current_asmdata.CurrAsmList,oldCurrExitLabel)
+          cg.g_local_unwind(current_asmdata.CurrAsmList,oldBreakLabel)
         else
         else
           cg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
           cg.a_jmp_always(current_asmdata.CurrAsmList,oldBreakLabel);
       end;
       end;
@@ -519,7 +519,7 @@ procedure tx64tryexceptnode.pass_generate_code;
         cg.a_label(current_asmdata.CurrAsmList,continueexceptlabel);
         cg.a_label(current_asmdata.CurrAsmList,continueexceptlabel);
         cg.g_call(current_asmdata.CurrAsmList,'FPC_DONEEXCEPTION');
         cg.g_call(current_asmdata.CurrAsmList,'FPC_DONEEXCEPTION');
         if (fc_unwind in flowcontrol) then
         if (fc_unwind in flowcontrol) then
-          cg.g_local_unwind(current_asmdata.CurrAsmList,oldCurrExitLabel)
+          cg.g_local_unwind(current_asmdata.CurrAsmList,oldContinueLabel)
         else
         else
           cg.a_jmp_always(current_asmdata.CurrAsmList,oldContinueLabel);
           cg.a_jmp_always(current_asmdata.CurrAsmList,oldContinueLabel);
       end;
       end;