From 6434772c3c81663e6371cc7d65e4719071a03636 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 17 Oct 2007 21:52:25 +0000 Subject: [PATCH] * error message when a goto label is optimized away git-svn-id: trunk@8837 - --- .gitattributes | 1 + compiler/msg/errore.msg | 3 + compiler/msgidx.inc | 5 +- compiler/msgtxt.inc | 379 ++++++++++++++++++++-------------------- compiler/nflw.pas | 51 +++--- compiler/opttail.pas | 6 +- compiler/pstatmnt.pas | 2 +- tests/webtbf/tw9053.pp | 18 ++ 8 files changed, 244 insertions(+), 221 deletions(-) create mode 100644 tests/webtbf/tw9053.pp diff --git a/.gitattributes b/.gitattributes index 82fc2c0b6d..0e9e8db70f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7488,6 +7488,7 @@ tests/webtbf/tw9039a.pp svneol=native#text/plain tests/webtbf/tw9039b.pp svneol=native#text/plain tests/webtbf/tw9039c.pp svneol=native#text/plain tests/webtbf/tw9039d.pp svneol=native#text/plain +tests/webtbf/tw9053.pp svneol=native#text/plain tests/webtbf/tw9225.pp svneol=native#text/plain tests/webtbf/tw9306c.pp svneol=native#text/plain tests/webtbf/tw9499.pp svneol=native#text/plain diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 2529518194..37214ad480 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -1717,6 +1717,9 @@ cg_f_unknown_system_type=06047_F_Cannot find system type "$1". Check if you use cg_h_inherited_ignored=06048_H_Inherited call to abstract method ignored % This messages appears only in Delphi mode when you call an abstract method % of a parent class via \var{inherited;}. The call is then ignored. +cg_e_goto_label_not_found=06049_E_Goto label "$1" not defined or optimized away +% The label used in the goto definition is not defined or optimized away by the +% unreachable code elemination. % \end{description} # EndOfTeX diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index d6eb62fb1d..03c0655141 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -472,6 +472,7 @@ const cg_f_unknown_compilerproc=06046; cg_f_unknown_system_type=06047; cg_h_inherited_ignored=06048; + cg_e_goto_label_not_found=06049; asmr_d_start_reading=07000; asmr_d_finish_reading=07001; asmr_e_none_label_contain_at=07002; @@ -731,9 +732,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 45258; + MsgTxtSize = 45312; MsgIdxMax : array[1..20] of longint=( - 24,86,237,83,63,49,107,22,135,60, + 24,86,237,83,63,50,107,22,135,60, 42,1,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 9b5ac8ca41..3f148f0ef6 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -538,280 +538,281 @@ const msgtxt : array[0..000188,1..240] of char=( '06047_F_Cannot find system type "$1". Check if you use the correct run'+ ' time library.'#000+ '06048_H_Inherited call to abstract method ignored'#000+ - '0','7000_DL_Starting $1 styled assembler parsing'#000+ + '0','6049_E_Goto label "$1" not defined or optimized away'#000+ + '07000_DL_Starting $1 styled assembler parsing'#000+ '07001_DL_Finished $1 styled assembler parsing'#000+ '07002_E_Non-label pattern contains @'#000+ '07004_E_Error building record offset'#000+ - '07005_E_OFFSET used without identifier'#000+ - '07006_E_TYPE used without identifier',#000+ + '07005_E_OFFSET used w','ithout identifier'#000+ + '07006_E_TYPE used without identifier'#000+ '07007_E_Cannot use local variable or parameters here'#000+ '07008_E_need to use OFFSET here'#000+ '07009_E_need to use $ here'#000+ '07010_E_Cannot use multiple relocatable symbols'#000+ - '07011_E_Relocatable symbol can only be added'#000+ - '07012_E_Invalid constant expressio','n'#000+ + '07011_E_Relocatable symbo','l can only be added'#000+ + '07012_E_Invalid constant expression'#000+ '07013_E_Relocatable symbol is not allowed'#000+ '07014_E_Invalid reference syntax'#000+ '07015_E_You can not reach $1 from that code'#000+ '07016_E_Local symbols/labels aren'#039't allowed as references'#000+ - '07017_E_Invalid base and index register usage'#000+ - '07018_W_Possibl','e error in object field handling'#000+ + '07017_E','_Invalid base and index register usage'#000+ + '07018_W_Possible error in object field handling'#000+ '07019_E_Wrong scale factor specified'#000+ '07020_E_Multiple index register usage'#000+ '07021_E_Invalid operand type'#000+ '07022_E_Invalid string as opcode operand: $1'#000+ - '07023_W_@CODE and @DATA not supported'#000+ - '07024_E_Null label r','eferences are not allowed'#000+ + '0702','3_W_@CODE and @DATA not supported'#000+ + '07024_E_Null label references are not allowed'#000+ '07025_E_Divide by zero in asm evaluator'#000+ '07026_E_Illegal expression'#000+ '07027_E_escape sequence ignored: $1'#000+ '07028_E_Invalid symbol reference'#000+ - '07029_W_Fwait can cause emulation problems with emu387'#000+ - '07030_W_$1 without oper','and translated into $1P'#000+ + '07029_W_Fwait can cause ','emulation problems with emu387'#000+ + '07030_W_$1 without operand translated into $1P'#000+ '07031_W_ENTER instruction is not supported by Linux kernel'#000+ '07032_W_Calling an overload function in assembler'#000+ '07033_E_Unsupported symbol type for operand'#000+ - '07034_E_Constant value out of bounds'#000+ - '07035_E_Error converting d','ecimal $1'#000+ + '07034_E_C','onstant value out of bounds'#000+ + '07035_E_Error converting decimal $1'#000+ '07036_E_Error converting octal $1'#000+ '07037_E_Error converting binary $1'#000+ '07038_E_Error converting hexadecimal $1'#000+ '07039_H_$1 translated to $2'#000+ - '07040_W_$1 is associated to an overloaded function'#000+ + '07040_W_$1 is associated to an overload','ed function'#000+ '07041_E_Cannot use SELF outside a method'#000+ - '0','7042_E_Cannot use OLDEBP outside a nested procedure'#000+ + '07042_E_Cannot use OLDEBP outside a nested procedure'#000+ '07043_W_Procedures can'#039't return any value in asm code'#000+ '07044_E_SEG not supported'#000+ - '07045_E_Size suffix and destination or source size do not match'#000+ - '07046_W_Size suffix and destination or sourc','e size do not match'#000+ + '07045_E_Size suffix and destination or source size do ','not match'#000+ + '07046_W_Size suffix and destination or source size do not match'#000+ '07047_E_Assembler syntax error'#000+ '07048_E_Invalid combination of opcode and operands'#000+ '07049_E_Assembler syntax error in operand'#000+ - '07050_E_Assembler syntax error in constant'#000+ + '07050_E_Assembler syntax error in constant',#000+ '07051_E_Invalid String expression'#000+ - '07052_W_constant wi','th symbol $1 for address which is not on a pointe'+ - 'r'#000+ + '07052_W_constant with symbol $1 for address which is not on a pointer'#000+ '07053_E_Unrecognized opcode $1'#000+ '07054_E_Invalid or missing opcode'#000+ '07055_E_Invalid combination of prefix and opcode: $1'#000+ - '07056_E_Invalid combination of override and opcode: $1'#000+ - '07057_E_Too many',' operands on line'#000+ + '07056_E_Invalid c','ombination of override and opcode: $1'#000+ + '07057_E_Too many operands on line'#000+ '07058_W_NEAR ignored'#000+ '07059_W_FAR ignored'#000+ '07060_E_Duplicate local symbol $1'#000+ '07061_E_Undefined local symbol $1'#000+ '07062_E_Unknown label identifier $1'#000+ - '07063_E_Invalid register name'#000+ + '07063_E_Invalid registe','r name'#000+ '07064_E_Invalid floating point register name'#000+ - '07','066_W_Modulo not supported'#000+ + '07066_W_Modulo not supported'#000+ '07067_E_Invalid floating point constant $1'#000+ '07068_E_Invalid floating point expression'#000+ '07069_E_Wrong symbol type'#000+ - '07070_E_Cannot index a local var or parameter with a register'#000+ - '07071_E_Invalid segment override express','ion'#000+ + '07070_E_Cannot index a local var or parameter wi','th a register'#000+ + '07071_E_Invalid segment override expression'#000+ '07072_W_Identifier $1 supposed external'#000+ '07073_E_Strings not allowed as constants'#000+ '07074_No type of variable specified'#000+ '07075_E_assembler code not returned to text section'#000+ - '07076_E_Not a directive or local symbol $1'#000+ - '07077_E_Using a defined ','name as a local label'#000+ + '07076_E_Not a',' directive or local symbol $1'#000+ + '07077_E_Using a defined name as a local label'#000+ '07078_E_Dollar token is used without an identifier'#000+ '07079_W_32bit constant created for address'#000+ '07080_N_.align is target specific, use .balign or .p2align'#000+ - '07081_E_Can'#039't access fields directly for parameters'#000+ - '07082_E_Can'#039't',' access fields of objects/classes directly'#000+ + '07081_E_Can',#039't access fields directly for parameters'#000+ + '07082_E_Can'#039't access fields of objects/classes directly'#000+ '07083_E_No size specified and unable to determine the size of the oper'+ 'ands'#000+ '07084_E_Cannot use RESULT in this function'#000+ - '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+ - '07087_W_"$1 %st(n)','" translated into "$1 %st,%st(n)"'#000+ + '07086_W_"$1" without oper','and translated into "$1 %st,%st(1)"'#000+ + '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+ '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+ '07089_E_Char < not allowed here'#000+ '07090_E_Char > not allowed here'#000+ '07093_W_ALIGN not supported'#000+ - '07094_E_Inc and Dec cannot be together'#000+ - '07095_E_Invalid reglist',' for movem'#000+ + '07094_E_','Inc and Dec cannot be together'#000+ + '07095_E_Invalid reglist for movem'#000+ '07096_E_Reglist invalid for opcode'#000+ '07097_E_Higher cpu mode required ($1)'#000+ '07098_W_No size specified and unable to determine the size of the oper'+ 'ands, using DWORD as default'#000+ - '07099_E_Syntax error while trying to parse a shifter oper','and'#000+ + '070','99_E_Syntax error while trying to parse a shifter operand'#000+ '07100_E_Address of packed component is not at a byte boundary'#000+ '07101_W_No size specified and unable to determine the size of the oper'+ 'ands, using BYTE as default'#000+ - '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+ - '07103_W_Use of +off','set(%ebp) is not compatible with regcall conventi'+ - 'on'#000+ + '07102_W_Use of +offset','(%ebp) for parameters invalid here'#000+ + '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+ + #000+ '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+ 'ess'#000+ - '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+ - ' lost'#000+ - '07106_E_VMTOffset must be used in comb','ination with a virtual method,'+ - ' and "$1" is not virtual'#000+ + '07105_W_Use of -offset(%esp), access may cause a crash or va','lue may '+ + 'be lost'#000+ + '07106_E_VMTOffset must be used in combination with a virtual method, a'+ + 'nd "$1" is not virtual'#000+ '08000_F_Too many assembler files'#000+ '08001_F_Selected assembler output not supported'#000+ '08002_F_Comp not supported'#000+ - '08003_F_Direct not support for binary writers'#000+ - '08004_E_Allocating of data is o','nly allowed in bss section'#000+ + '08003_F_Direct not supp','ort for binary writers'#000+ + '08004_E_Allocating of data is only allowed in bss section'#000+ '08005_F_No binary writer selected'#000+ '08006_E_Asm: Opcode $1 not in table'#000+ '08007_E_Asm: $1 invalid combination of opcode and operands'#000+ - '08008_E_Asm: 16 Bit references not supported'#000+ - '08009_E_Asm: Invalid effective address'#000, + '08008_E_Asm: 16 Bit references',' not supported'#000+ + '08009_E_Asm: Invalid effective address'#000+ '08010_E_Asm: Immediate or reference expected'#000+ '08011_E_Asm: $1 value exceeds bounds $2'#000+ '08012_E_Asm: Short jump is out of range $1'#000+ '08013_E_Asm: Undefined label $1'#000+ - '08014_E_Asm: Comp type not supported for this target'#000+ - '08015_E_Asm: Extended type ','not supported for this target'#000+ + '08014_E_Asm: Comp type not',' supported for this target'#000+ + '08015_E_Asm: Extended type not supported for this target'#000+ '08016_E_Asm: Duplicate label $1'#000+ '08017_E_Asm: Redefined label $1'#000+ '08018_E_Asm: First defined here'#000+ '08019_E_Asm: Invalid register $1'#000+ - '08020_E_Asm: 16 or 32 Bit references not supported'#000+ - '08021_E_Asm: 64 Bit operands n','ot supported'#000+ + '08020_E_Asm: 16 or 32 Bit r','eferences not supported'#000+ + '08021_E_Asm: 64 Bit operands not supported'#000+ '09000_W_Source operating system redefined'#000+ '09001_I_Assembling (pipe) $1'#000+ '09002_E_Can'#039't create assembler file: $1'#000+ '09003_E_Can'#039't create object file: $1'#000+ - '09004_E_Can'#039't create archive file: $1'#000+ - '09005_E_Assembler $1 not found, switching',' to external assembling'#000+ + '09004_E_Can'#039't create arch','ive file: $1'#000+ + '09005_E_Assembler $1 not found, switching to external assembling'#000+ '09006_T_Using assembler: $1'#000+ '09007_E_Error while assembling exitcode $1'#000+ '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ 'ssembling'#000+ - '09009_I_Assembling $1'#000+ + '09009_I_Assembl','ing $1'#000+ '09010_I_Assembling with smartlinking $1'#000+ - '09011_W','_Object $1 not found, Linking may fail !'#000+ + '09011_W_Object $1 not found, Linking may fail !'#000+ '09012_W_Library $1 not found, Linking may fail !'#000+ '09013_E_Error while linking'#000+ '09014_E_Can'#039't call the linker, switching to external linking'#000+ - '09015_I_Linking $1'#000+ - '09016_E_Util $1 not found, switching to ex','ternal linking'#000+ + '09015_I','_Linking $1'#000+ + '09016_E_Util $1 not found, switching to external linking'#000+ '09017_T_Using util $1'#000+ '09018_E_Creation of Executables not supported'#000+ '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ '09020_I_Closing script $1'#000+ - '09021_E_resource compiler not found, switching to external mode'#000+ - '09022_I_','Compiling resource $1'#000+ + '09021_E_resource c','ompiler not found, switching to external mode'#000+ + '09022_I_Compiling resource $1'#000+ '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+ 'king'#000+ '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ #000+ - '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ - 'g'#000+ - '09026_E_unit',' $1 can'#039't be smart or static linked'#000+ + '09025_T_unit $1 can'#039't be s','hared linked, switching to static link'+ + 'ing'#000+ + '09026_E_unit $1 can'#039't be smart or static linked'#000+ '09027_E_unit $1 can'#039't be shared or static linked'#000+ '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+ - '09128_F_Can'#039't post process executable $1'#000+ + '09128_F_Can'#039't post process executabl','e $1'#000+ '09129_F_Can'#039't open executable $1'#000+ - '09130_X_Size of ','Code: $1 bytes'#000+ + '09130_X_Size of Code: $1 bytes'#000+ '09131_X_Size of initialized data: $1 bytes'#000+ '09132_X_Size of uninitialized data: $1 bytes'#000+ '09133_X_Stack space reserved: $1 bytes'#000+ '09134_X_Stack space committed: $1 bytes'#000+ - '10000_T_Unitsearch: $1'#000+ + '1000','0_T_Unitsearch: $1'#000+ '10001_T_PPU Loading $1'#000+ - '10002_U_PPU ','Name: $1'#000+ + '10002_U_PPU Name: $1'#000+ '10003_U_PPU Flags: $1'#000+ '10004_U_PPU Crc: $1'#000+ '10005_U_PPU Time: $1'#000+ '10006_U_PPU File too short'#000+ '10007_U_PPU Invalid Header (no PPU at the begin)'#000+ '10008_U_PPU Invalid Version $1'#000+ - '10009_U_PPU is compiled for another processor'#000+ - '10010_U_PPU is ','compiled for an other target'#000+ + '10009_U','_PPU is compiled for another processor'#000+ + '10010_U_PPU is compiled for an other target'#000+ '10011_U_PPU Source: $1'#000+ '10012_U_Writing $1'#000+ '10013_F_Can'#039't Write PPU-File'#000+ '10014_F_Error reading PPU-File'#000+ '10015_F_unexpected end of PPU-File'#000+ - '10016_F_Invalid PPU-File entry: $1'#000+ + '10016_F_Invalid PPU-','File entry: $1'#000+ '10017_F_PPU Dbx count problem'#000+ - '10018_E_I','llegal unit name: $1'#000+ + '10018_E_Illegal unit name: $1'#000+ '10019_F_Too much units'#000+ '10020_F_Circular unit reference between $1 and $2'#000+ '10021_F_Can'#039't compile unit $1, no sources available'#000+ '10022_F_Can'#039't find unit $1 used by $2'#000+ - '10023_W_Unit $1 was not found but $2 exists'#000+ - '10024_F_Unit',' $1 searched but $2 found'#000+ + '10','023_W_Unit $1 was not found but $2 exists'#000+ + '10024_F_Unit $1 searched but $2 found'#000+ '10025_W_Compiling the system unit requires the -Us switch'#000+ '10026_F_There were $1 errors compiling module, stopping'#000+ '10027_U_Load from $1 ($2) unit $3'#000+ - '10028_U_Recompiling $1, checksum changed for $2'#000+ - '10029_U_Recompilin','g $1, source found only'#000+ + '10028_U_Reco','mpiling $1, checksum changed for $2'#000+ + '10029_U_Recompiling $1, source found only'#000+ '10030_U_Recompiling unit, static lib is older than ppufile'#000+ '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ - '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+ - '10033_U_Recompiling unit, obj is olde','r than asm'#000+ + '10032_U_Recompiling unit, obj and asm are ol','der than ppufile'#000+ + '10033_U_Recompiling unit, obj is older than asm'#000+ '10034_U_Parsing interface of $1'#000+ '10035_U_Parsing implementation of $1'#000+ '10036_U_Second load for unit $1'#000+ '10037_U_PPU Check file $1 time $2'#000+ - '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+ - '10041_U_File $1 is newer than',' PPU file $2'#000+ + '10040_W_Can'#039't recompile unit $1, but fou','nd modifed include files'+ + #000+ + '10041_U_File $1 is newer than PPU file $2'#000+ '10042_U_Trying to use a unit which was compiled with a different FPU m'+ 'ode'#000+ '10043_U_Loading interface units from $1'#000+ '10044_U_Loading implementation units from $1'#000+ - '10045_U_Interface CRC changed for unit $1'#000+ - '10046_U_Implementation CRC',' changed for unit $1'#000+ + '10045_U_Interf','ace CRC changed for unit $1'#000+ + '10046_U_Implementation CRC changed for unit $1'#000+ '10047_U_Finished compiling unit $1'#000+ '10048_U_Add dependency of $1 to $2'#000+ '10049_U_No reload, is caller: $1'#000+ '10050_U_No reload, already in second compile: $1'#000+ - '10051_U_Flag for reload: $1'#000+ + '10051_U_Flag ','for reload: $1'#000+ '10052_U_Forced reloading'#000+ - '10053_U_Previo','us state of $1: $2'#000+ + '10053_U_Previous state of $1: $2'#000+ '10054_U_Already compiling $1, setting second compile'#000+ '10055_U_Loading unit $1'#000+ '10056_U_Finished loading unit $1'#000+ '10057_U_Registering new unit $1'#000+ - '10058_U_Re-resolving unit $1'#000+ - '10059_U_Skipping re-resolving unit $1, still loadi','ng used units'#000+ + '10058_U_Re-resolving unit',' $1'#000+ + '10059_U_Skipping re-resolving unit $1, still loading used units'#000+ '11000_O_$1 [options] [options]'#000+ '11001_W_Only one source file supported'#000+ '11002_W_DEF file can be created only for OS/2'#000+ - '11003_E_nested response files are not supported'#000+ + '11003_E_nested response files are not suppor','ted'#000+ '11004_F_No source file name in command line'#000+ - '11005_','N_No option inside $1 config file'#000+ + '11005_N_No option inside $1 config file'#000+ '11006_E_Illegal parameter: $1'#000+ '11007_H_-? writes help pages'#000+ '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $1'#000+ - '11010_D_Reading further options from $1'#000+ + '11010_D_Reading further o','ptions from $1'#000+ '11011_W_Target is already set to: $1'#000+ - '11','012_W_Shared libs not supported on DOS platform, reverting to stat'+ - 'ic'#000+ + '11012_W_Shared libs not supported on DOS platform, reverting to static'+ + #000+ '11013_F_too many IF(N)DEFs'#000+ '11014_F_too many ENDIFs'#000+ '11015_F_open conditional at the end of the file'#000+ - '11016_W_Debug information generation is not supported by this executab'+ - 'le',#000+ + '11016_W_Debug info','rmation generation is not supported by this execut'+ + 'able'#000+ '11017_H_Try recompiling with -dGDB'#000+ '11018_W_You are using the obsolete switch $1'#000+ '11019_W_You are using the obsolete switch $1, please use $2'#000+ - '11020_N_Switching assembler to default source writing assembler'#000+ - '11021_W_Assembler output selected "','$1" is not compatible with "$2"'#000+ + '11020_N_Switching assembler to default source',' writing assembler'#000+ + '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ '11022_W_"$1" assembler use forced'#000+ '11026_T_Reading options from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ - '11029__*** press enter ***'#000+ - '11030_H_Start of reading config file ','$1'#000+ + '11029__***',' press enter ***'#000+ + '11030_H_Start of reading config file $1'#000+ '11031_H_End of reading config file $1'#000+ '11032_D_interpreting option "$1"'#000+ '11036_D_interpreting firstpass option "$1"'#000+ '11033_D_interpreting file option "$1"'#000+ - '11034_D_Reading config file "$1"'#000+ + '11034_D_Reading config file "$1','"'#000+ '11035_D_found source file name "$1"'#000+ - '11039_E_Unknown ','code page'#000+ + '11039_E_Unknown code page'#000+ '11040_F_Config file $1 is a directory'#000+ '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+ 'ugging disabled'#000+ - '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ - 'CPU'#010+ - 'Copyright (c) 1993-2007 by Flori','an Klaempfl'#000+ + '11023_Free Pascal Compiler version $FPCFULLVERSION [','$FPCDATE] for $F'+ + 'PCCPU'#010+ + 'Copyright (c) 1993-2007 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ @@ -821,10 +822,10 @@ const msgtxt : array[0..000188,1..240] of char=( ' $OSTARGETS'#010+ #010+ 'Supported CPU instruction sets:'#010+ - ' $INSTRUCTIONSETS'#010+ + ' ',' $INSTRUCTIONSETS'#010+ #010+ 'Supported FPU instruction sets:'#010+ - ' $','FPUINSTRUCTIONSETS'#010+ + ' $FPUINSTRUCTIONSETS'#010+ #010+ 'Supported Optimizations:'#010+ ' $OPTIMIZATIONS'#010+ @@ -832,256 +833,256 @@ const msgtxt : array[0..000188,1..240] of char=( 'This program comes under the GNU General Public Licence'#010+ 'For more information read COPYING.FPC'#010+ #010+ - 'Report bugs,suggestions etc to:'#010+ + 'Report bugs,suggestions etc ','to:'#010+ ' bugs@freepascal.org'#000+ - '11025_**0*_Pu','t + after a boolean switch option to enable it, - to di'+ - 'sable it'#010+ + '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+ + 'ble it'#010+ '**1a_The compiler doesn'#039't delete the generated assembler file'#010+ '**2al_List sourcecode lines in assembler file'#010+ - '**2an_List node info in assembler file'#010+ - '*L2ap_Use pipes instead of cr','eating temporary assembler files'#010+ + '**2an_List nod','e info in assembler file'#010+ + '*L2ap_Use pipes instead of creating temporary assembler files'#010+ '**2ar_List register allocation/release info in assembler file'#010+ '**2at_List temp allocation/release info in assembler file'#010+ '**1A_Output format:'#010+ - '**2Adefault_Use default assembler'#010+ + '**2Adefaul','t_Use default assembler'#010+ '3*2Aas_Assemble using GNU AS'#010+ - '3','*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ + '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ - '3*2Awasm_Obj file using Wasm (Watcom)'#010+ - '3*2Anasmobj_Obj file using',' Nasm'#010+ + '3*2Awasm_O','bj file using Wasm (Watcom)'#010+ + '3*2Anasmobj_Obj file using Nasm'#010+ '3*2Amasm_Obj file using Masm (Microsoft)'#010+ '3*2Atasm_Obj file using Tasm (Borland)'#010+ '3*2Aelf_ELF (Linux) using internal writer'#010+ '3*2Acoff_COFF (Go32v2) using internal writer'#010+ - '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+ - '4*2Aas_Assemble us','ing GNU AS'#010+ + '3*2Apecoff_PE','-COFF (Win32) using internal writer'#010+ + '4*2Aas_Assemble using GNU AS'#010+ '6*2Aas_Unix o-file using GNU AS'#010+ '6*2Agas_GNU Motorola assembler'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ 'A*2Aas_Assemble using GNU AS'#010+ - 'P*2Aas_Assemble using GNU AS'#010+ + 'P*2Aas_Assemble us','ing GNU AS'#010+ 'S*2Aas_Assemble using GNU AS'#010+ - '**1b_Generate ','browser info'#010+ + '**1b_Generate browser info'#010+ '**2bl_Generate local symbol info'#010+ '**1B_Build all modules'#010+ '**1C_Code generation options:'#010+ '**2Cc_Set default calling convention to '#010+ - '**2CD_Create also dynamic library (not supported)'#010+ - '**2Ce_Compilation with emulated floating ','point opcodes'#010+ + '**2CD_Create also dynamic library (no','t supported)'#010+ + '**2Ce_Compilation with emulated floating point opcodes'#010+ '**2Cf_Select fpu instruction set to use, see fpc -i for possible va'+ 'lues'#010+ '**2CF_Minimal floating point constant precision (default, 32, 64)'#010+ '**2Cg_Generate PIC code'#010+ - '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ - '**2Ci_','IO-checking'#010+ + '**2C','h_ bytes heap (between 1023 and 67107840)'#010+ + '**2Ci_IO-checking'#010+ '**2Cn_Omit linking stage'#010+ '**2Co_Check overflow of integer operations'#010+ '**2Cp_Select instruction set, see fpc -i for possible values'#010+ '**2CP=_ packing settings'#010+ - '**3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, ','2, '+ + '**3CPPACKSE','T=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, '+ '4 and 8'#010+ '**2Cr_Range checking'#010+ '**2CR_Verify object method call validity'#010+ '**2Cs_Set stack size to '#010+ '**2Ct_Stack checking'#010+ '**2CX_Create also smartlinked library'#010+ - '**1d_Defines the symbol '#010+ + '**1d_Defines the sym','bol '#010+ '**1D_Generate a DEF file'#010+ - '**2Dd_Set descript','ion to '#010+ + '**2Dd_Set description to '#010+ '**2Dv_Set DLL version to '#010+ '*O2Dw_PM application'#010+ '**1e_Set path to executable'#010+ '**1E_Same as -Cn'#010+ '**1fPIC_Same as -Cg'#010+ '**1F_Set file names and paths:'#010+ - '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ - 'sed'#010, + '**2Fa[,y]_(for a ','program) load units and [y] before uses is p'+ + 'arsed'#010+ '**2Fc_Set input codepage to '#010+ '**2FC_Set RC compiler binary name to '#010+ '**2FD_Set the directory where to search for compiler utilities'#010+ '**2Fe_Redirect error output to '#010+ - '**2Ff_Add to framework path (Darwin only)'#010+ - '**2FE','_Set exe/unit output path to '#010+ + '**2','Ff_Add to framework path (Darwin only)'#010+ + '**2FE_Set exe/unit output path to '#010+ '**2Fi_Add to include path'#010+ '**2Fl_Add to library path'#010+ '**2FL_Use as dynamic linker'#010+ - '**2Fm_Load unicode conversion table from .txt in the compiler di'+ - 'r'#010+ + '**2Fm_Load unicode conversion table from .txt ','in the compiler '+ + 'dir'#010+ '**2Fo_Add to object path'#010+ - '**','2Fr_Load error message file '#010+ + '**2Fr_Load error message file '#010+ '**2FR_Set resource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ '**2FU_Set unit output path to , overrides -FE'#010+ - '*g1g_Generate debug information (default format for target)'#010+ - '*g2gc_Generate check','s for pointers'#010+ + '*g1g_Generate debug inform','ation (default format for target)'#010+ + '*g2gc_Generate checks for pointers'#010+ '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ '*g2gl_Use line info unit (show more info with backtraces)'#010+ '*g2go_Set debug information options'#010+ - '*g3godwarfsets_ Enable Dwarf set debug information (breaks gdb <',' 6.5'+ + '*g3godwarf','sets_ Enable Dwarf set debug information (breaks gdb < 6.5'+ ')'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate stabs debug information'#010+ '*g2gt_Trash local variables (to detect uninitialized uses)'#010+ - '*g2gv_Generates programs traceable with valgrind'#010+ - '*g2gw_Generate dwarf-2 debug information (sam','e as -gw2)'#010+ + '*g2gv_Generates programs traceable with ','valgrind'#010+ + '*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+ '*g2gw2_Generate dwarf-2 debug information'#010+ '*g2gw3_Generate dwarf-3 debug information'#010+ '**1i_Information'#010+ '**2iD_Return compiler date'#010+ '**2iV_Return short compiler version'#010+ - '**2iW_Return full compiler version'#010+ + '**2iW_Retur','n full compiler version'#010+ '**2iSO_Return compiler OS'#010+ - '**2i','SP_Return compiler host processor'#010+ + '**2iSP_Return compiler host processor'#010+ '**2iTO_Return target OS'#010+ '**2iTP_Return target processor'#010+ '**1I_Add to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_Write logo'#010+ - '**1M_Set language mode to '#010+ + '**1M_Set langua','ge mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '*','*2Mobjfpc_FPC mode with Object Pascal support'#010+ + '**2Mobjfpc_FPC mode with Object Pascal support'#010+ '**2Mdelphi_Delphi 7 compatibility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+ '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ - '**1n_Do not read the default config files'#010+ - '**1N_Node tree opt','imizations'#010+ + '**1n_Do n','ot read the default config files'#010+ + '**1N_Node tree optimizations'#010+ '**2Nu_Unroll loops'#010+ '**1o_Change the name of the executable produced to '#010+ '**1O_Optimizations:'#010+ '**2O-_Disable optimizations'#010+ - '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ - '**2O2_Level 2 optimizations (-O1 + quick op','timizations)'#010+ + '**2O1_Level 1 optimizations (quick and debugger',' friendly)'#010+ + '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2Oa=_Set alignment'#010+ '**2Oo[NO]_Enable or disable optimizations, see fpc -i for possible '+ 'values'#010+ - '**2Op_Set target cpu for optimizing, see fpc -i for possible valu','e'+ - 's'#010+ + '**2Op_Set t','arget cpu for optimizing, see fpc -i for possible valu'+ + 'es'#010+ '**2Os_Optimize for size rather than speed'#010+ '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1R_Assembler reading style:'#010+ '**2Rdefault_Use default assembler for target'#010+ - '3*2Ratt_Read AT&T style assembler'#010+ - '3*2Rintel_Read Intel st','yle assembler'#010+ + '3*2','Ratt_Read AT&T style assembler'#010+ + '3*2Rintel_Read Intel style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ '**1S_Syntax options:'#010+ '**2S2_Same as -Mobjfpc'#010+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ '**2Sa_Turn on assertions'#010+ - '**2Sd_Same as -Mdelphi'#010+ - '**2Se_Error options. is a combination',' of the following:'#010+ + '**2Sd_Same as',' -Mdelphi'#010+ + '**2Se_Error options. is a combination of the following:'#010+ '**3*_ : Compiler halts after the errors (default is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ '**3*_n : Compiler also halts after notes'#010+ - '**3*_h : Compiler also halts after hints'#010+ - '**2Sg_Enable LABEL and GOTO (defa','ult in -Mtp and -Mdelphi)'#010+ + '**3*_h : Compiler al','so halts after hints'#010+ + '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ '**2Sh_Use ansistrings by default instead of shortstrings'#010+ '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ '**2Sk_Load fpcylix unit'#010+ - '**2SI_Set interface style to '#010+ - '**3SIcom_COM compatible inter','face (default)'#010+ + '**2SI_Se','t interface style to '#010+ + '**3SIcom_COM compatible interface (default)'#010+ '**3SIcorba_CORBA compatible interface'#010+ '**2Sm_Support macros like C (global)'#010+ '**2So_Same as -Mtp'#010+ '**2Ss_Constructor name must be init (destructor must be done)'#010+ - '**2St_Allow static keyword in objects'#010+ - '**2Sx_Enable exception keywords',' (default in Delphi/ObjFPC modes)'#010+ + '**2St_Allow sta','tic keyword in objects'#010+ + '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ '**1s_Do not call assembler and linker'#010+ '**2sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ - '**2sr_Skip register allocation phase (use with -alr)'#010+ + '**2sr_Skip register allocation phase',' (use with -alr)'#010+ '**1T_Target operating system:'#010+ - '3*2T','emx_OS/2 via EMX (including EMX/RSX extender)'#010+ + '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnetbsd_NetBSD'#010+ - '3*2Tnetware_Novell Netware Module (clib)'#010+ + '3*2Tnetware_Novell Netware Module (cli','b)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ - '3*2Topenb','sd_OpenBSD'#010+ + '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsunos_SunOS/Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ - '4*2Tlinux_Linux'#010+ + '4*2Tlin','ux_Linux'#010+ '6*2Tamiga_Commodore Amiga'#010+ - '6*2Tatari_Atari ST/','STe/TT'#010+ + '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux/m68k'#010+ '6*2Tmacos_Macintosh m68k (not supported)'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ 'P*2Tamiga_AmigaOS on PowerPC'#010+ - 'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+ + 'P*2Tdarwin_Darwin and Mac OS X on',' PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ - 'P*2Tmacos_Mac OS (','classic) on PowerPC'#010+ + 'P*2Tmacos_Mac OS (classic) on PowerPC'#010+ 'P*2Tmorphos_MorphOS'#010+ 'S*2Tlinux_Linux'#010+ '**1u_Undefines the symbol '#010+ '**1U_Unit options:'#010+ '**2Un_Do not check where the unit name matches the file name'#010+ - '**2Ur_Generate release unit files (never automatically recompiled)'#010+ - '**2U','s_Compile a system unit'#010+ + '**2Ur_Generate re','lease unit files (never automatically recompiled)'#010+ + '**2Us_Compile a system unit'#010+ '**1v_Be verbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ - '**2*_w : Show warnings u : Show unit info'#010+ - '**2*_n : Show notes ',' t : Show tried/used files'#010+ + '**2*_w : Show warnings ',' u : Show unit info'#010+ + '**2*_n : Show notes t : Show tried/used files'#010+ '**2*_h : Show hints c : Show conditionals'#010+ '**2*_i : Show general info d : Show debug info'#010+ - '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ - '**2*_a : Show ','everything x : Executable info (Win32 only'+ - ')'#010+ + '**2*_l : Show linenumbers ',' r : Rhide/GCC compatibility mod'+ + 'e'#010+ + '**2*_a : Show everything x : Executable info (Win32 only)'#010+ '**2*_b : Write file names messages with full path'#010+ '**2*_v : Write fpcdebug.txt with p : Write tree.log with parse tre'+ 'e'#010+ - '**2*_ lots of debugging info'#010+ - '3*1W_Target-specific option','s (targets)'#010+ + '**2*_ ',' lots of debugging info'#010+ + '3*1W_Target-specific options (targets)'#010+ 'A*1W_Target-specific options (targets)'#010+ 'P*1W_Target-specific options (targets)'#010+ '3*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'P*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'p*2Wb_Create a bundle instead of a libra','ry (Darwin)'#010+ + 'P*2Wb_Create a bundle instead of a lib','rary (Darwin)'#010+ + 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+ '3*2WB_Create a relocatable image (Windows)'#010+ 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ - 'A*2WC_Specify console type application (Windows)'#010+ - 'P*2WC_Specify console ty','pe application (Classic Mac OS)'#010+ + 'A*2WC_Specify conso','le type application (Windows)'#010+ + 'P*2WC_Specify console type application (Classic Mac OS)'#010+ '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ - '3*2WG_Specify graphic type ap','plication (EMX, OS/2, Windows)'#010+ + '3*2WF_Specify full-screen type',' application (EMX, OS/2)'#010+ + '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ 'A*2WG_Specify graphic type application (Windows)'#010+ 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ - '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - 'A*2WN_Do not generate relocation c','ode, needed for debugging (Windows'+ + '3*2WN_Do not generate relocation code, needed for ','debugging (Windows'+ ')'#010+ + 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ '3*2WR_Generate relocation code (Windows)'#010+ 'A*2WR_Generate relocation code (Windows)'#010+ 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ - '**1X_Executable options:'#010+ - '**2Xc_Pass --shared/-dynamic to the link','er (BeOS, Darwin, FreeBSD, L'+ - 'inux)'#010+ + '**1X_Execut','able options:'#010+ + '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ + 'ux)'#010+ '**2Xd_Do not use standard library search path (needed for cross compil'+ 'e)'#010+ '**2Xe_Use external linker'#010+ - '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ + '**2XD_Try to link units dynamically (defines FPC','_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ - '**2Xm_Generat','e link map'#010+ + '**2Xm_Generate link map'#010+ '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ 's '#039'main'#039')'#010+ '**2XP_Prepend the binutils names with the prefix '#010+ - '**2Xr_Set library search path to (needed for cross compile) (Be'+ - 'OS, Linux)'#010+ - '**2XR_Prepend ',' to all linker search paths (BeOS, Darwin, FreeB'+ - 'SD, Linux, Mac OS, Solaris)'#010+ + '**2Xr_Set library search path to (needed',' for cross compile) ('+ + 'BeOS, Linux)'#010+ + '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ + ', Linux, Mac OS, Solaris)'#010+ '**2Xs_Strip all symbols from executable'#010+ - '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ - '**2Xt_Link with static libraries (-static is passed to',' linker)'#010+ + '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010, + '**2Xt_Link with static libraries (-static is passed to linker)'#010+ '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ diff --git a/compiler/nflw.pas b/compiler/nflw.pas index ab7d670d86..b2d229d2cd 100644 --- a/compiler/nflw.pas +++ b/compiler/nflw.pas @@ -127,15 +127,10 @@ interface tcontinuenodeclass = class of tcontinuenode; tgotonode = class(tnode) - { we still need this for resolving forward gotos } labelsym : tlabelsym; labelnode : tlabelnode; exceptionblock : integer; -{ internlab : tinterngotolabel;} - constructor create(p : tlabelnode);virtual; - { as long as we don't know the label node we can't resolve it } - constructor create_sym(p : tlabelsym);virtual; -{ constructor createintern(g:tinterngotolabel);} + constructor create(p : tlabelsym);virtual; constructor ppuload(t:tnodetype;ppufile:tcompilerppufile);override; procedure ppuwrite(ppufile:tcompilerppufile);override; procedure buildderefimpl;override; @@ -151,11 +146,9 @@ interface exceptionblock : integer; { when copying trees, this points to the newly created copy of a label } copiedto : tlabelnode; - { contains all goto nodesrefering to this label } - referinggotonodes : TFPObjectList; - { original labelsym, used for writing label referenced from assembler block } labsym : tlabelsym; constructor create(l:tnode;alabsym:tlabelsym);virtual; + destructor destroy;override; constructor ppuload(t:tnodetype;ppufile:tcompilerppufile);override; procedure ppuwrite(ppufile:tcompilerppufile);override; procedure buildderefimpl;override; @@ -651,7 +644,7 @@ implementation begin result:=nil; { optimize constant expressions } - if left.nodetype=ordconstn then + if (left.nodetype=ordconstn) then begin if tordconstnode(left).value.uvalue=1 then begin @@ -960,23 +953,11 @@ implementation TGOTONODE *****************************************************************************} - constructor tgotonode.create(p : tlabelnode); + constructor tgotonode.create(p : tlabelsym); begin inherited create(goton); exceptionblock:=aktexceptblock; - labelnode:=p; - labelsym:=nil; - end; - - - constructor tgotonode.create_sym(p : tlabelsym); - begin - inherited create(goton); - exceptionblock:=aktexceptblock; - if assigned(p.code) then - labelnode:=tlabelnode(p.code) - else - labelnode:=nil; + labelnode:=nil; labelsym:=p; end; @@ -1024,12 +1005,14 @@ implementation expectloc:=LOC_VOID; include(current_procinfo.flags,pi_has_goto); - if not(assigned(labelnode)) then + { The labelnode can already be set when + this node was copied } + if not assigned(labelnode) then begin - if assigned(labelsym) and assigned(labelsym.code) then + if assigned(labelsym.code) then labelnode:=tlabelnode(labelsym.code) else - internalerror(200506183); + CGMessage1(cg_e_goto_label_not_found,labelsym.realname); end; { check if we don't mess with exception blocks } @@ -1054,6 +1037,8 @@ implementation else internalerror(200610291); end; + + p.labelsym:=labelsym; p.labelnode:=tlabelnode(labelnode.dogetcopy); result:=p; end; @@ -1074,6 +1059,8 @@ implementation inherited create(labeln,l); exceptionblock:=aktexceptblock; labsym:=alabsym; + { Register labelnode in labelsym } + labsym.code:=self; end; @@ -1084,6 +1071,16 @@ implementation end; + destructor tlabelnode.destroy; + begin + { Remove reference in labelsym, this is to prevent + goto's to this label } + if assigned(labsym) and (labsym.code=pointer(self)) then + labsym.code:=nil; + inherited destroy; + end; + + procedure tlabelnode.ppuwrite(ppufile:tcompilerppufile); begin inherited ppuwrite(ppufile); diff --git a/compiler/opttail.pas b/compiler/opttail.pas index 423b21417b..5612848bf5 100644 --- a/compiler/opttail.pas +++ b/compiler/opttail.pas @@ -154,7 +154,7 @@ unit opttail; addstatement(nodes,copynodes); { create goto } - addstatement(nodes,cgotonode.create(labelnode)); + addstatement(nodes,cgotonode.create(labelnode.labsym)); if assigned(usedcallnode.callcleanupblock) then begin @@ -180,6 +180,7 @@ unit opttail; s : tstatementnode; oldnodes : tnode; i : longint; + labelsym : tlabelsym; begin { check if the parameters actually would support tail recursion elimination } for i:=0 to p.paras.count-1 do @@ -194,7 +195,8 @@ unit opttail; vardef.needs_inittable) then exit; - labelnode:=clabelnode.create(cnothingnode.create,nil); + labelsym:=tlabelsym.create('$opttail'); + labelnode:=clabelnode.create(cnothingnode.create,labelsym); if find_and_replace_tailcalls(n) then begin oldnodes:=n; diff --git a/compiler/pstatmnt.pas b/compiler/pstatmnt.pas index ccff6d32ba..6af71567c9 100644 --- a/compiler/pstatmnt.pas +++ b/compiler/pstatmnt.pas @@ -977,7 +977,7 @@ implementation { goto is only allowed to labels within the current scope } if srsym.owner<>current_procinfo.procdef.localst then CGMessage(parser_e_goto_outside_proc); - code:=cgotonode.create_sym(tlabelsym(srsym)); + code:=cgotonode.create(tlabelsym(srsym)); tgotonode(code).labelsym:=tlabelsym(srsym); { set flag that this label is used } tlabelsym(srsym).used:=true; diff --git a/tests/webtbf/tw9053.pp b/tests/webtbf/tw9053.pp new file mode 100644 index 0000000000..1e09edb66e --- /dev/null +++ b/tests/webtbf/tw9053.pp @@ -0,0 +1,18 @@ +{ %fail } + +program UnknownLocalSymbol; + + procedure p; + label + 10; + begin + if False then + begin + 10: Exit + end; + goto 10 + end; + +begin +end. +