+ implement auto inlining (-Ooautoinline)

+ implement trashing of local variables if subroutine is inlined
* fix some errors releated to interproc. gotos and inlining
+ node_count function
* inline cannot be used with iochecking and safecall calling conventions
* track inherited usage
* don't inline if inherited is used

git-svn-id: trunk@21335 -

.gitattributes

@@ -10804,6 +10804,7 @@ tests/test/tisogoto1.pp svneol=native#text/pascal
 tests/test/tisogoto2.pp svneol=native#text/pascal
 tests/test/tisogoto3.pp svneol=native#text/pascal
 tests/test/tisogoto4.pp svneol=native#text/pascal
+tests/test/tisogoto5.pp svneol=native#text/pascal
 tests/test/tlib1a.pp svneol=native#text/plain
 tests/test/tlib1b.pp svneol=native#text/plain
 tests/test/tlib2a.pp svneol=native#text/plain

compiler/globals.pas

@@ -103,11 +103,26 @@ interface
        MathPiExtended : textendedrec = (bytes : (64,0,201,15,218,162,33,104,194,53));
 {$endif FPC_LITTLE_ENDIAN}
 {$endif}
+
        CP_UTF8 = 65001;
        CP_UTF16LE = 1200;
        CP_UTF16BE = 1201;
        CP_NONE  = 65535;
 
+       { by default no local variable trashing }
+       localvartrashing: longint = -1;
+
+       nroftrashvalues = 4;
+{$ifdef cpu64bitalu}
+      trashintvalues: array[0..nroftrashvalues-1] of aint = ($5555555555555555,aint($AAAAAAAAAAAAAAAA),aint($EFEFEFEFEFEFEFEF),0);
+{$endif cpu64bitalu}
+{$ifdef cpu32bitalu}
+      trashintvalues: array[0..nroftrashvalues-1] of aint = ($55555555,aint($AAAAAAAA),aint($EFEFEFEF),0);
+{$endif cpu32bitalu}
+{$ifdef cpu8bitalu}
+      trashintvalues: array[0..nroftrashvalues-1] of aint = ($55,aint($AA),aint($EF),0);
+{$endif cpu8bitalu}
+
 
     type
        { this is written to ppus during token recording for generics so it must be packed }
@@ -340,11 +355,6 @@ interface
        defaultmainaliasname = 'main';
        mainaliasname : string = defaultmainaliasname;
 
-       { by default no local variable trashing }
-       localvartrashing: longint = -1;
-       { actual values are defined in ncgutil.pas }
-       nroftrashvalues = 4;
-
     const
       default_settings : TSettings = (
         alignment : (

compiler/globtype.pas

@@ -234,7 +234,7 @@ interface
          cs_opt_level1,cs_opt_level2,cs_opt_level3,
          cs_opt_regvar,cs_opt_uncertain,cs_opt_size,cs_opt_stackframe,
          cs_opt_peephole,cs_opt_asmcse,cs_opt_loopunroll,cs_opt_tailrecursion,cs_opt_nodecse,
-         cs_opt_nodedfa,cs_opt_loopstrength,cs_opt_scheduler
+         cs_opt_nodedfa,cs_opt_loopstrength,cs_opt_scheduler,cs_opt_autoinline
        );
        toptimizerswitches = set of toptimizerswitch;
 
@@ -258,7 +258,7 @@ interface
          'LEVEL1','LEVEL2','LEVEL3',
          'REGVAR','UNCERTAIN','SIZE','STACKFRAME',
          'PEEPHOLE','ASMCSE','LOOPUNROLL','TAILREC','CSE',
-         'DFA','STRENGTH','SCHEDULE'
+         'DFA','STRENGTH','SCHEDULE','AUTOINLINE'
        );
        WPOptimizerSwitchStr : array [twpoptimizerswitch] of string[14] = (
          'DEVIRTCALLS','OPTVMTS','SYMBOLLIVENESS'
@@ -521,7 +521,11 @@ interface
          { subroutine contains interprocedural used labels }
          pi_has_interproclabel,
          { subroutine has unwind info (win64) }
-         pi_has_unwind_info
+         pi_has_unwind_info,
+         { subroutine contains interprocedural gotos }
+         pi_has_global_goto,
+         { subroutine contains inherited call }
+         pi_has_inherited
        );
        tprocinfoflags=set of tprocinfoflag;
 

compiler/msg/errore.msg

@@ -2278,9 +2278,10 @@ cg_e_goto_across_procedures_with_exceptions_not_allowed=06053_E_Leaving procedur
 % which use automated types like ansistrings or class constructurs are affected by this too.
 cg_e_mod_only_defined_for_pos_quotient=06054_E_In ISO mode, the mod operator is defined only for positive quotient
 % In ISO pascal, only positive values are allowed for the quotient: \var{n mod m} is only valid if \var{m>0}.
+cg_d_autoinlining=06055_DL_Auto inlining: $1
+% Due to auto inlining turned on, the compiler auto inlines this subroutine.
 % \end{description}
 # EndOfTeX
-
 #
 # Assembler reader
 #

compiler/msgidx.inc

@@ -629,6 +629,7 @@ const
   cg_e_labels_cannot_defined_outside_declaration_scope=06052;
   cg_e_goto_across_procedures_with_exceptions_not_allowed=06053;
   cg_e_mod_only_defined_for_pos_quotient=06054;
+  cg_d_autoinlining=06055;
   asmr_d_start_reading=07000;
   asmr_d_finish_reading=07001;
   asmr_e_none_label_contain_at=07002;
@@ -942,9 +943,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 65774;
+  MsgTxtSize = 65801;
 
   MsgIdxMax : array[1..20] of longint=(
-    26,92,322,118,87,55,116,26,202,63,
+    26,92,322,118,87,56,116,26,202,63,
     53,20,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -774,201 +774,204 @@ const msgtxt : array[0..000274,1..240] of char=(
   'frames using goto is not allowed'#000+
   '06054_E_In ISO mode, the mod operator is defined only for positive quo'+
   'tient'#000+
-  '07000_DL_Starting $1 styled assemb','ler parsing'#000+
+  '06055_DL_Auto inlining: $1'#000+
+  '07000_D','L_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+
-  '07007_E_Cannot use local variabl','e or parameters here'#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 expression'#000+
-  '07013_E_Relocatable symbol is n','ot allowed'#000+
+  '0701','3_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
   '07015_E_You cannot 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_Possible error in object field handling'#000+
-  '0','7019_E_Wrong scale factor specified'#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 references are not allowed'#000+
-  '07025_E_','Divide by zero in asm evaluator'#000+
+  '07024_E_Null label referenc','es 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 operand translated into $1P'#000+
-  '07031_W_EN','TER instruction is not supported by Linux kernel'#000+
+  '07030_W_$1 without operand tra','nslated 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 decimal $1'#000+
-  '07036_E_Error converting',' octal $1'#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+
   '07041_E_Cannot use SELF outside a method'#000+
-  '07042_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 source size do not match'#000+
-  '07047_E_Assemb','ler syntax error'#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+
   '07051_E_Invalid String expression'#000+
-  '07052_W_constant with symbol $1 for address which is ','not on a pointe'+
+  '07052_W_constant with symb','ol $1 for address which is not on a pointe'+
   'r'#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+
-  '07058_W_NEAR ign','ored'#000+
+  '07057_E_Too many operan','ds 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+
   '07064_E_Invalid floating point register name'#000+
-  '07066_W_Modulo not supported'#000+
-  '07067_E','_Invalid floating point constant $1'#000+
+  '07066_W_M','odulo 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 expression'#000+
-  '07072_W_Identifier $1 supposed',' external'#000+
+  '070','72_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
   '07074_E_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+
-  '07078_E_Do','llar token is used without an identifier'#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/classe','s directly'#000+
+  '07082_E_Can'#039't acce','ss 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+
+  '07087_W_"$1 %st(n)" tra','nslated 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+
-  '07096_E_Reglist inval','id for opcode'#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 operand'#000+
-  '07100_E_Address of packed co','mponent is not at a byte boundary'#000+
+  '0','7100_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 +offset(%ebp) is not compatible with',' regcall conventi'+
+  '07103_W_Use of +offset(%','ebp) is not compatible with regcall conventi'+
   'on'#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 combination with a virtual method, a',
-  'nd "$1" is not virtual'#000+
+  '07106_E_VMTOffset must be used in combinati','on with a virtual method,'+
+  ' and "$1" is not virtual'#000+
   '07107_E_Generating PIC, but reference is not PIC-safe'#000+
   '07108_E_All registers in a register set must be of the same kind and w'+
   'idth'#000+
   '07109_E_A register set cannot be empty'#000+
-  '07110_W_@GOTPCREL is useless and potentially dang','ereous for local sy'+
+  '07110_W_@GOTPCREL is u','seless and potentially dangereous for local sy'+
   'mbols'#000+
   '07111_W_Constant with general purpose segment register'#000+
   '07112_E_Invalid offset value for $1'#000+
   '07113_E_Invalid register for $1'#000+
-  '07114_E_SEH directives are allowed only in pure assembler procedures'#000+
-  '07115_E_Directive "$1" ','is not supported for the current target'#000+
+  '07114_E_SEH directives are allowed only in pure assembler procedu','res'+
+  #000+
+  '07115_E_Directive "$1" is not supported for the current target'#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 only allowed in ','bss section'#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+
-  '08010_E_Asm: Im','mediate or reference expected'#000+
+  '08009_E_Asm: Invalid effect','ive 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 f','or this target'#000+
+  '08015_E_Asm: Ex','tended 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 not supported'#000+
-  '08','022_E_Asm: AH,BH,CH or DH cannot be used in an instruction requiri'+
-  'ng REX prefix'#000+
+  '08021_E_Asm: 64 Bi','t operands not supported'#000+
+  '08022_E_Asm: AH,BH,CH or DH cannot be used in an instruction requiring'+
+  ' REX prefix'#000+
   '08023_E_Missing .seh_endprologue directive'#000+
   '08024_E_Function prologue exceeds 255 bytes'#000+
-  '08025_E_.seh_handlerdata directive without preceding .seh_handler'#000+
-  '09000_W','_Source operating system redefined'#000+
+  '08025_E_.seh_handlerdata directive without pre','ceding .seh_handler'#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 (error code: $2)'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_E_Assembler $1 not found, switching to',' external assembling'#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+
-  '09010_I_Assembling with smartlinking $1'#000+
-  '09011_W_Ob','ject $1 not found, Linking may fail !'#000+
+  '09010_I_Assembling with',' smartlinking $1'#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 exter','nal linking'#000+
+  '09016_E_Util $1 no','t 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 "$1" not found, switching to external mode'#000+
-  '09022_','I_Compiling resource $1'#000+
+  '09021_E_resource compiler "$1" not found, switch','ing 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_un','it $1 can'#039't be smart or static linked'#000+
+  '09025_T_unit $1 can'#039't be shared linked, switching t','o 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+
   '09029_E_Error while compiling resources'#000+
-  '09030_E_Can'#039't call the resource compiler "$1", s','witching to exte'+
+  '09030_E_Can'#039't call th','e resource compiler "$1", switching to exte'+
   'rnal mode'#000+
   '09031_E_Can'#039't open resource file "$1"'#000+
   '09032_E_Can'#039't write resource file "$1"'#000+
   '09033_N_File "$1" not found for backquoted cat command'#000+
   '09128_F_Can'#039't post process executable $1'#000+
-  '09129_F_Can'#039't open executable $1'#000+
-  '09130_X_','Size of Code: $1 bytes'#000+
+  '09129_F_Can'#039't ','open executable $1'#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+
-  '09200_F_Executable image size is too big for $1 ta','rget.'#000+
+  '09200_F_Executable imag','e size is too big for $1 target.'#000+
   '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
   ' "$2".'#000+
   '10000_T_Unitsearch: $1'#000+
@@ -976,172 +979,172 @@ const msgtxt : array[0..000274,1..240] of char=(
   '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,
+  '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 another target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't Write PPU-File'#000,
+  '10','013_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+
   '10017_F_PPU Dbx count problem'#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+
+  '10020_F_Circular unit referen','ce 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+
-  '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '10026_F_There we','re $1 errors compiling module, stopping'#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_Recompiling $1, source found only'#000+
-  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Recompili','ng unit, shared lib is older than ppufile'#000+
+  '10030_U_Recompiling unit, static lib is older tha','n 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 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+
+  '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 the one used for creating PPU file $2'#000+
-  '10042_U_Trying to use a unit which was compiled with a differ','ent FPU'+
+  '10042_U_Trying to use a unit which',' was compiled with a different FPU'+
   ' mode'#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+
-  '10047_U_Finished compiling unit $1'#000+
-  '10048_U_Adding dep','endency: $1 depends on $2'#000+
+  '10047_U_Finished compiling',' unit $1'#000+
+  '10048_U_Adding dependency: $1 depends on $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+
   '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
-  '10054_U_Already compiling $1, setting second c','ompile'#000+
+  '10054_U_Already com','piling $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 loading used units'#000+
-  '10060_U_Unloading resource unit $1 (not needed)'#000+
-  '100','61_E_Unit $1 was compiled using a different whole program optimiz'+
-  'ation feedback input ($2, $3); recompile it without wpo or use the sam'+
-  'e wpo feedback input file for this compilation invocation'#000+
-  '10062_U_Indirect interface (objects/classes) CR','C changed for unit $1'+
+  '10060_U_Unloading resour','ce unit $1 (not needed)'#000+
+  '10061_E_Unit $1 was compiled using a different whole program optimizat'+
+  'ion feedback input ($2, $3); recompile it without wpo or use the same '+
+  'wpo feedback input file for this compilation invocation'#000+
+  '10062_U_Indirect int','erface (objects/classes) CRC changed for unit $1'+
   #000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported, changing source file to compil'+
   'e from "$1" into "$2"'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files are not',' supported'#000+
+  '11003_E_ne','sted response files are not supported'#000+
   '11004_F_No source file name in command line'#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 fu','rther options from $1'#000+
+  '11009_F_Unable to open',' file $1'#000+
+  '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+
   'ntered'#000+
-  '11014_F_In options file $1 at lin','e $2 unexpected \var{\#ENDIFs} enco'+
+  '11014_','F_In options file $1 at line $2 unexpected \var{\#ENDIFs} enco'+
   'untered'#000+
   '11015_F_Open conditional at the end of the options file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
-  '11018_W_You are using the obsolet','e switch $1'#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+
-  '11022_W_"$1" assembler use forced'#000+
-  '110','26_T_Reading options from file $1'#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_O_*** 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+
+  '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+
   '11035_D_found source file name "$1"'#000+
   '11039_E_Unknown codepage "$1"'#000+
-  '11040_F_Config file $1 is a directory'#000+
-  '11041_W_Assemble','r output selected "$1" cannot generate debug info, d'+
-  'ebugging disabled'#000+
+  '11040_F_Config file $1 is a',' directory'#000+
+  '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
+  'ugging disabled'#000+
   '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
   '11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+
-  'var{\#IF(N)DEF} found'#000+
-  '11044_F_Op','tion "$1" is not, or not yet, supported on the current tar'+
-  'get platform'#000+
+  'var{\','#IF(N)DEF} found'#000+
+  '11044_F_Option "$1" is not, or not yet, supported on the current targe'+
+  't platform'#000+
   '11045_F_The feature "$1" is not, or not yet, supported on the selected'+
   ' target platform'#000+
-  '11046_N_DWARF debug information cannot be used with smart linking on t'+
-  'his target, ','switching to static linking'#000+
+  '11046_N_DWARF debug information cannot be used with sma','rt linking on'+
+  ' this target, switching to static linking'#000+
   '11047_W_Option "$1" is ignored for the current target platform.'#000+
   '11048_W_Disabling external debug information because it is unsupported'+
-  ' for the selected target/debug format combination.'#000+
-  '11049_N_DWARF debug informa','tion cannot be used with smart linking wi'+
-  'th external assembler, disabling static library creation.'#000+
+  ' for the selected target/debug format combination.'#000,
+  '11049_N_DWARF debug information cannot be used with smart linking with'+
+  ' external assembler, disabling static library creation.'#000+
   '11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+
   'e: $1'#000+
-  '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment ','var'+
+  '11051_E_Invalid value for IPHONEOS_DEP','LOYMENT_TARGET environment var'+
   'iable: $1'#000+
   '11052_E_You must use a FPU type of VFPV2, VFPV3 or VFPV3_D16 when usin'+
   'g the EABIHF ABI target'#000+
   '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
-  '12001_D_Processing whole program optimization information in wpo fe','e'+
+  '12001_D_Processing whole program optimiz','ation information in wpo fee'+
   'dback file "$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
   ' in wpo feedback file "$1"'#000+
   '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
   'ck file'#000+
-  '12004_W_No handler registered for whole program ','optimization section'+
+  '12004_W_No handler re','gistered for whole program optimization section'+
   ' "$2" at line $1 of wpo feedback file, ignoring'#000+
   '12005_D_Found whole program optimization section "$1" with information'+
   ' about "$2"'#000+
-  '12006_F_The selected whole program optimizations require a previously '+
-  'generated feedback f','ile (use -Fw to specify)'#000+
+  '12006_F_The selected whole program optimizations require a prev','iousl'+
+  'y generated feedback file (use -Fw to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
   'am optimization found'#000+
   '12008_F_Specify a whole program optimization feedback file to store th'+
-  'e generated info in (using -FW)'#000+
-  '12009_E_Not generatin','g any whole program optimization information, y'+
-  'et a feedback file was specified (using -FW)'#000+
+  'e generated info in (using',' -FW)'#000+
+  '12009_E_Not generating any whole program optimization information, yet'+
+  ' a feedback file was specified (using -FW)'#000+
   '12010_E_Not performing any whole program optimizations, yet an input f'+
   'eedback file was specified (using -Fw)'#000+
-  '12011_D_Skipping whole program optimiza','tion section "$1", because no'+
+  '12011_D_Skip','ping whole program optimization section "$1", because no'+
   't needed by the requested optimizations'#000+
   '12012_W_Overriding previously read information for "$1" from feedback '+
   'input file using information in section "$2"'#000+
-  '12013_E_Cannot extract symbol liveness information from ','program when'+
+  '12013_E_Cannot extract symbol',' liveness information from program when'+
   ' stripping symbols, use -Xs-'#000+
   '12014_E_Cannot extract symbol liveness information from program when w'+
   'hen not linking'#000+
   '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
-  'n from linked program'#000+
-  '12016_E_Error during ','reading symbol liveness information produced by'+
-  ' "$1"'#000+
+  'n from linked pr','ogram'#000+
+  '12016_E_Error during reading symbol liveness information produced by "'+
+  '$1"'#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
   'ion from linked program'#000+
-  '12018_E_Collection of symbol liveness information can only help when u'+
-  'sing smart linking, use',' -CX -XX'#000+
+  '12018_E_Collection of symbol liveness information can only help wh','en'+
+  ' using smart linking, use -CX -XX'#000+
   '12019_E_Cannot create specified whole program optimisation feedback fi'+
   'le "$1"'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
-  'Copyright (c) 1993-2012 by Florian Klaempfl and others'#000+
-  '11024_Free Pascal Compil','er version $FPCVERSION'#010+
+  'Copyright (c) 1993-2012 by Florian Klaempfl and othe','rs'#000+
+  '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
@@ -1153,9 +1156,9 @@ const msgtxt : array[0..000274,1..240] of char=(
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
-  '  $FPUINSTRUCTIONSETS'#010+
+  '  $FPUINSTRU','CTIONSETS'#010+
   #010+
-  'Supported ABI ta','rgets:'#010+
+  'Supported ABI targets:'#010+
   '  $ABITARGETS'#010+
   #010+
   'Supported Optimizations:'#010+
@@ -1168,96 +1171,97 @@ const msgtxt : array[0..000274,1..240] of char=(
   'Supported Microcontroller types:'#010+
   '  $CONTROLLERTYPES'#010+
   #010+
-  'This program comes under the GNU General Public Licence'#010+
-  'F','or more information read COPYING.v2'#010+
+  'This program comes under the G','NU General Public Licence'#010+
+  'For more information read COPYING.v2'#010+
   #010+
   'Please report bugs in our bug tracker on:'#010+
   '                 http://bugs.freepascal.org'#010+
   #010+
   'More information may be found on our WWW pages (including directions'#010+
-  'for mailing lists useful for asking questions o','r discussing potentia'+
+  'for mailing lists us','eful for asking questions or discussing potentia'+
   'l'#010+
   'new features, etc.):'#010+
   '                 http://www.freepascal.org'#000+
   '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 sou','rcecode lines in assembler file'#010+
+  '**1a_The compiler doesn'#039't delete the generated as','sembler file'#010+
+  '**2al_List sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List register allocation/release info in assembler file'#010+
-  '**2at_List temp allocat','ion/release info in assembler file'#010+
+  '**2ar_List register allocation/release info in assembler f','ile'#010+
+  '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
   '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
-  '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_EL','F32 (Linux) file using Nasm'#010+
+  '3*2Anasmcoff_COFF (Go32v2) fil','e 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*2Amasm_Obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_','Obj file using Tasm (Borland)'#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 using GNU AS'#010+
-  '4*2Agas_Assemble using GNU GAS'#010+
-  '4*2Agas-darwin','_Assemble darwin Mach-O64 using GNU GAS'#010+
+  '4*2Agas_Assemble u','sing GNU GAS'#010+
+  '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU GAS'#010+
   '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
   '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
   '4*2Aelf_ELF (Linux-64bit) using internal writer'#010+
-  '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Agas_GNU Motorola ','assembler'#010+
+  '6*2Aas_Unix o-file using G','NU 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+
   'S*2Aas_Assemble using GNU AS'#010+
   '**1b_Generate browser info'#010+
-  '**2bl_Generate local symbol info'#010+
-  '**1B_Build all mod','ules'#010+
+  '**2bl_Generate local sym','bol info'#010+
+  '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
   '**2C3<x>_Turn on ieee error checking for constants'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
   '**2Cb_Generate big-endian code'#010+
-  '**2Cc<x>_Set default calling convention to <x>'#010+
-  '**2CD_Create also dyn','amic library (not supported)'#010+
+  '**2Cc<x>_Set default calling convention t','o <x>'#010+
+  '**2CD_Create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
   'lues'#010+
-  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
-  '**2Cg_Genera','te PIC code'#010+
+  '**2CF<x>_Minimal floating point constant precision (de','fault, 32, 64)'+
+  #010+
+  '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_Omit linking stage'#010+
   'P*2CN_Generate nil-pointer checks (AIX-only)'#010+
   '**2Co_Check overflow of integer operations'#010+
-  '**2CO_Check for possible overflow of integer ','operations'#010+
+  '**2CO_Check for po','ssible overflow of integer operations'#010+
   '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
   '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
   '**2Cr_Range checking'#010+
-  '**2CR_Verify object method call valid','ity'#010+
+  '**2CR_Veri','fy object method call validity'#010+
   '**2Cs<n>_Set stack checking size to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)<<<<<<< HEAD'#010+
   'p*2CT<x>_Target-specific code generation options'#010+
   'P*2CT<x>_Target-specific code generation options'#010+
-  'J*2CT<x>_Target-specific code gene','ration options'#010+
+  'J*2CT<x','>_Target-specific code generation options'#010+
   'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
   'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
-  'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+
-  'd','e for initializing integer array constants'#010+
+  'J*3CTcompactintarrayinit_ Generate smaller (','but potentially slower) '+
+  'code for initializing integer array constants'#010+
   'J*2Cv_Var/out parameter copy-out checking'#010+
   '**2CX_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
-  '**2Dv<x>_Set DLL version to <','x>'#010+
+  '**','2Dv<x>_Set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
@@ -1265,125 +1269,125 @@ const msgtxt : array[0..000274,1..240] of char=(
   '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
-  '**2Fc<x>_Set input codepage to <x>'#010+
-  '**2FC','<x>_Set RC compiler binary name to <x>'#010+
+  '**2Fc<x>_Set ','input codepage to <x>'#010+
+  '**2FC<x>_Set RC compiler binary name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
   '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
-  '**2Ff<x>_Add <x> to framework path (Darwin ','only)'#010+
+  '**2Ff<x>_Add <x>',' to framework path (Darwin only)'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
   '**2Fi<x>_Add <x> to include path'#010+
   '**2Fl<x>_Add <x> to library path'#010+
   '**2FL<x>_Use <x> as dynamic linker'#010+
-  '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
-  'r'#010+
-  '**2Fo<x>_Add <x> to ','object path'#010+
+  '**2Fm<x>_Load unicode conversion table from <x>.txt in the compil','er '+
+  'dir'#010+
+  '**2Fo<x>_Add <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker to <x>'#010+
   '**2Fu<x>_Add <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
-  '**2FW<x>_Store generated whole-program optimization feedback in <x','>'#010+
+  '**2FW<x>_Store generated whole-program ','optimization feedback in <x>'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
   '*g1g_Generate debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers'#010+
-  '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*g','2gl_Use line info unit (show more info with backtraces)'#010+
+  '*g2gh_Use heaptrace unit (for memory le','ak/corruption debugging)'#010+
+  '*g2gl_Use line info unit (show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
   '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
   'aks gdb < 6.5)'#010+
-  '*g3gostabsabsincludes_ Store absolute/full include file paths in Sta','b'+
-  's'#010+
+  '*g3gostabsabsincludes_ Store absolute/ful','l include file paths in Sta'+
+  'bs'#010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#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 program','s traceable with Valgrind'#010+
+  '*g2gt_Trash local variables (to detect uninitialized us','es)'#010+
+  '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
-  '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
-  '**1i_Information'#010,
+  '*g2gw4_Generate DWARFv4 debug information (expe','rimental)'#010+
+  '**1i_Information'#010+
   '**2iD_Return compiler date'#010+
   '**2iV_Return short compiler version'#010+
   '**2iW_Return full compiler version'#010+
   '**2iSO_Return compiler OS'#010+
   '**2iSP_Return compiler host processor'#010+
   '**2iTO_Return target OS'#010+
-  '**2iTP_Return target processor'#010+
-  '**1I<x>_Add <x> to incl','ude path'#010+
+  '**2iTP_Return target proces','sor'#010+
+  '**1I<x>_Add <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_Write logo'#010+
   '**1M<x>_Set language mode to <x>'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
   '**2Mobjfpc_FPC mode with Object Pascal support'#010+
-  '**2Mdelphi_Delphi 7 compatibility mode'#010+
-  '**2Mtp_TP/BP 7.0 compatibil','ity mode'#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<x>_Node tree optimizations'#010+
   '**2Nu_Unroll loops'#010+
-  '**1o<x>_Change the name of the executable produced to <x>'#010+
+  '**1o<x>_Change the name of the executable produced to <','x>'#010+
   '**1O<x>_Optimizations:'#010+
-  '*','*2O-_Disable optimizations'#010+
+  '**2O-_Disable optimizations'#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<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enab','le or disable optimizations, see fpc -i for possibl'+
-  'e values'#010+
+  '**2Oa<x>=<y>_Set ','alignment'#010+
+  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
+  'values'#010+
   '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
   #010+
   '**2OW<x>_Generate whole-program optimization feedback for optimization'+
-  ' <x>, see fpc -i for possible values'#010+
-  '**','2Ow<x>_Perform whole-program optimization <x>, see fpc -i for poss'+
-  'ible values'#010+
+  ' <x>, see fp','c -i for possible values'#010+
+  '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
+  'le values'#010+
   '**2Os_Optimize for size rather than speed'#010+
   '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
-  'F*1P<x>_Target CPU / compiler related options:'#010+
-  'F*2PB_Show de','fault compiler binary'#010+
+  'F*1P<x>_Target CPU / compiler rel','ated options:'#010+
+  'F*2PB_Show default compiler binary'#010+
   'F*2PP_Show default target cpu'#010+
   'F*2P<x>_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sp'+
   'arc,x86_64'#010+
   '**1R<x>_Assembler reading style:'#010+
   '**2Rdefault_Use default assembler for target'#010+
-  '3*2Ratt_Read AT&T style assem','bler'#010+
+  '3*','2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read motorola style assembler'#010+
   '**1S<x>_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<x>_Error o','ptions. <x> is a combination of the following:'#010+
+  '**2Sd_Same a','s -Mdelphi'#010+
+  '**2Se<x>_Error options. <x> is a combination of the following:'#010+
   '**3*_<n> : Compiler halts after the <n> 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 (default in -Mtp and -Mdelphi)'#010+
+  '**3*_h : Compiler a','lso halts after hints'#010+
+  '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use reference counted strings (ansistring by default) instead of'+
   ' shortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
-  '**2Sk_Load fpcylix unit'#010+
-  '**2SI<x>_S','et interface style to <x>'#010+
+  '**2Sk_L','oad fpcylix unit'#010+
+  '**2SI<x>_Set interface style to <x>'#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+
-  '**2Sx_Enable e','xception keywords (default in Delphi/ObjFPC modes)'#010+
+  '**2Ss_Constructor name must be init (destructor m','ust be done)'#010+
+  '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**2Sy_@<pointer> returns a typed pointer, same as $T+'#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+
+  '**2st_Generate script to link on',' target'#010+
+  '**2sr_Skip register allocation phase (use with -alr)'#010+
   '**1T<x>_Target operating system:'#010+
   '3*2Tdarwin_Darwin/Mac OS X'#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*2Tiphonesim_ iPhoneSimulat','or from iOS SDK 3.2+ (older versions: -T'+
+  '3','*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -T'+
   'darwin)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
@@ -1391,8 +1395,8 @@ const msgtxt : array[0..000274,1..240] of char=(
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
-  '3*2Tsunos_SunOS/Solaris'#010+
-  '3*2T','symbian_Symbian OS'#010+
+  '3','*2Tsunos_SunOS/Solaris'#010+
+  '3*2Tsymbian_Symbian OS'#010+
   '3*2Tsolaris_Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
@@ -1400,7 +1404,7 @@ const msgtxt : array[0..000274,1..240] of char=(
   '3*2Twince_Windows CE'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
   '4*2Tlinux_Linux'#010+
-  '4*2Twin64_Win64 (64 bit Windows systems)'#010,
+  '4*2Twin64_Win6','4 (64 bit Windows systems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux'#010+
@@ -1410,119 +1414,119 @@ const msgtxt : array[0..000274,1..240] of char=(
   'A*2Twince_Windows CE'#010+
   'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
-  'P*2Tlinux_Linux'#010+
-  'P*2Tmacos_Mac OS (classic',')'#010+
+  'P*2Tlinux_Linu','x'#010+
+  'P*2Tmacos_Mac OS (classic)'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tsolaris_Solaris'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_Undefines the symbol <x>'#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+
-  '**','2Us_Compile a system unit'#010+
+  '**2Ur_Generate release unit files (never a','utomatically recompiled)'#010+
+  '**2Us_Compile a system unit'#010+
   '**1v<x>_Be verbose. <x> 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*_s : Sho','w time stamps            q : Show message numbers'#010+
+  '**2*_l : Show linenumbers            r : Rhide/GCC comp','atibility mod'+
+  'e'#010+
+  '**2*_s : Show time stamps            q : Show message numbers'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
   '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
   'e'#010+
-  '**2*_    with full path              v : Write f','pcdebug.txt with'#010+
+  '**2*_    with full pa','th              v : Write fpcdebug.txt with'#010+
   '**2*_                                    lots of debugging info'#010+
   '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
   'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
   'or version)'#010+
-  '**1W<x>_Target-specific opti','ons (targets)'#010+
+  '*','*1W<x>_Target-specific options (targets)'#010+
   '3*2WA_Specify native type application (Windows)'#010+
   '4*2WA_Specify native type application (Windows)'#010+
   'A*2WA_Specify native type application (Windows)'#010+
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'P*2Wb_Create a bundle instead ','of a library (Darwin)'#010+
+  'P*2','Wb_Create a bundle instead of a library (Darwin)'#010+
   'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'A*2Wb_Create a bundle instead of a library (Darwin)'#010+
   '4*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  '3*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  '3*2WBxxxx_','Set image base to xxxx (Windows, Symbian)'#010+
+  '3*2WB_Create a relocatable image (W','indows, Symbian)'#010+
+  '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
   '4*2WB_Create a relocatable image (Windows)'#010+
   '4*2WBxxxx_Set image base to xxxx (Windows)'#010+
   'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
-  '3*2WC_Sp','ecify console type application (EMX, OS/2, Windows)'#010+
+  'A*2WBxxxx_Set image base to xxxx ','(Windows, Symbian)'#010+
+  '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
   '4*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
-  'P*2WC_Specify console type application (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to ex','port functions of DLL or EXE (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+
   '4*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*2We_Use external resources (Darwin)'#010+
-  '4*2We_Use external resources (Darwin)'#010+
-  'A','*2We_Use external resources (Darwin)'#010+
+  '4*2We_Use ex','ternal resources (Darwin)'#010+
+  'A*2We_Use external resources (Darwin)'#010+
   'P*2We_Use external resources (Darwin)'#010+
   'p*2We_Use external resources (Darwin)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
-  '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
-  '4*2WG_Specif','y graphic type application (EMX, OS/2, Windows)'#010+
+  '3*2WG_Specify graphic type application (EMX, ','OS/2, Windows)'#010+
+  '4*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*2Wi_Use internal resources (Darwin)'#010+
-  '4*2Wi_Use internal resources (Darwin)'#010+
-  'A*2Wi_Use i','nternal resources (Darwin)'#010+
+  '4*2Wi_Use internal res','ources (Darwin)'#010+
+  'A*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
   'p*2Wi_Use internal resources (Darwin)'#010+
   '3*2WI_Turn on/off the usage of import sections (Windows)'#010+
-  '4*2WI_Turn on/off the usage of import sections (Windows)'#010+
-  'A*2WI_Turn on/off the u','sage of import sections (Windows)'#010+
+  '4*2WI_Turn on/off the usage of import sections (Windo','ws)'#010+
+  'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
   '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ','... (Dar'+
+  'p*2WM<x>_Minimum Mac OS X deploym','ent version: 10.4, 10.5.1, ... (Dar'+
   'win)'#010+
   'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
   '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A*2WN_Do not g','enerate relocation code, needed for debugging (Windows'+
+  '4*2WN_Do not generate relocation code, needed for debuggi','ng (Windows'+
   ')'#010+
+  'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
   'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
-  '3*2WP<x>_Minimum iOS deployment version: 3.0',', 5.0.1, ... (iphonesim)'+
+  '3*2WP<x>_Minimum ','iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'+
   #010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
   '4*2WR_Generate relocation code (Windows)'#010+
-  'A*2WR_Generate relocation code (Windows)'#010+
-  'P*2WT_Specify MPW tool typ','e application (Classic Mac OS)'#010+
+  'A*2WR_Generate relocation code (Windows)',#010+
+  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
   '**2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
   '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
   'ux)'#010+
-  '**2Xd_Do not search default library path (sometimes required for cross'+
-  '-c','ompiling when not using -XR)'#010+
+  '**2Xd_Do not search default library path (som','etimes required for cro'+
+  'ss-compiling when not using -XR)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xi_Use internal linker'#010+
-  '**2Xm_G','enerate link map'#010+
+  '**2Xi_','Use internal linker'#010+
+  '**2Xm_Generate link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
   'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
   '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_Set the linker'#039's rl','ink-path to <x> (needed for cross co'+
+  '*','*2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross co'+
   'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
   '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
   ', Linux, Mac OS, Solaris)'#010+
-  '**2Xs_Strip all symbols from executable'#010+
-  '**2XS_T','ry to link units statically (default, defines FPC_LINK_STATIC'+
-  ')'#010+
+  '**2Xs_Strip all symb','ols 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+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
-  '**1?_Show this help'#010+
-  '**1h_Shows this help w','ithout waiting'
+  '**1?_Show this ','help'#010+
+  '**1h_Shows this help without waiting'
 );

compiler/ncal.pas

@@ -112,6 +112,7 @@ interface
           { initialize/finalization of temps }
           callinitblock,
           callcleanupblock : tblocknode;
+
           { function return node for initialized types or supplied return variable.
             When the result is passed in a parameter then it is set to nil }
           funcretnode    : tnode;
@@ -266,8 +267,7 @@ implementation
       ncnv,nld,ninl,nadd,ncon,nmem,nset,nobjc,
       objcutil,
       procinfo,cpuinfo,
-      wpobase
-      ;
+      wpobase;
 
     type
      tobjectinfoitem = class(tlinkedlistitem)
@@ -3661,6 +3661,10 @@ implementation
             tempnode :=ctempcreatenode.create(tabstractvarsym(p).vardef,
               tabstractvarsym(p).vardef.size,tt_persistent,tabstractvarsym(p).is_regvar(false));
             addstatement(inlineinitstatement,tempnode);
+
+            if localvartrashing <> -1 then
+              addstatement(inlineinitstatement,trash_tempref(tempnode));
+
             addstatement(inlinecleanupstatement,ctempdeletenode.create(tempnode));
             { inherit addr_taken flag }
             if (tabstractvarsym(p).addr_taken) then
@@ -3810,6 +3814,10 @@ implementation
                         tempnode := ctempcreatenode.create(para.parasym.vardef,para.parasym.vardef.size,
                           tt_persistent,tparavarsym(para.parasym).is_regvar(false));
                         addstatement(inlineinitstatement,tempnode);
+
+                        if localvartrashing <> -1 then
+                          addstatement(inlineinitstatement,trash_tempref(tempnode));
+
                         addstatement(inlinecleanupstatement,ctempdeletenode.create(tempnode));
                         addstatement(inlineinitstatement,cassignmentnode.create(ctemprefnode.create(tempnode),
                             para.left));

compiler/ncgutil.pas

@@ -707,17 +707,6 @@ implementation
       end;
 
 
-    const
-{$ifdef cpu64bitalu}
-      trashintvalues: array[0..nroftrashvalues-1] of aint = ($5555555555555555,aint($AAAAAAAAAAAAAAAA),aint($EFEFEFEFEFEFEFEF),0);
-{$endif cpu64bitalu}
-{$ifdef cpu32bitalu}
-      trashintvalues: array[0..nroftrashvalues-1] of aint = ($55555555,aint($AAAAAAAA),aint($EFEFEFEF),0);
-{$endif cpu32bitalu}
-{$ifdef cpu8bitalu}
-      trashintvalues: array[0..nroftrashvalues-1] of aint = ($55,aint($AA),aint($EF),0);
-{$endif cpu8bitalu}
-
     procedure trash_reference(list: TAsmList; const ref: treference; size: aint);
       var
         countreg, valuereg: tregister;

compiler/nflw.pas

@@ -1745,6 +1745,7 @@ implementation
                     if assigned(labelsym.jumpbuf) then
                       begin
                         labelsym.nonlocal:=true;
+                        exclude(current_procinfo.procdef.procoptions,po_inline);
                         result:=ccallnode.createintern('fpc_longjmp',
                           ccallparanode.create(cordconstnode.create(1,sinttype,true),
                           ccallparanode.create(cloadnode.create(labelsym.jumpbuf,labelsym.jumpbuf.owner),
@@ -1788,7 +1789,10 @@ implementation
           begin
             { don't trigger IE when there was already an error, i.e. the
               label is not defined. See tw11763 (PFV) }
-            if errorcount=0 then
+            if (errorcount=0) and
+            { don't trigger IE if it's a global goto }
+               ((assigned(labelsym.owner) and (current_procinfo.procdef.parast.symtablelevel=labelsym.owner.symtablelevel)) or
+               not(assigned(labelsym.owner))) then
               internalerror(200610291);
           end;
         result:=p;
@@ -1869,7 +1873,10 @@ implementation
         include(current_procinfo.flags,pi_has_label);
 
         if assigned(labsym) and labsym.nonlocal then
-          include(current_procinfo.flags,pi_has_interproclabel);
+          begin
+            include(current_procinfo.flags,pi_has_interproclabel);
+            exclude(current_procinfo.procdef.procoptions,po_inline);
+          end;
 
         if assigned(left) then
           firstpass(left);

compiler/nutils.pas

@@ -85,7 +85,6 @@ interface
       parameter type) }
     function create_simplified_ord_const(value: tconstexprint; def: tdef; forinline: boolean): tnode;
 
-
     { returns true if n is only a tree of administrative nodes
       containing no code }
     function has_no_code(n : tnode) : boolean;
@@ -111,6 +110,13 @@ interface
     { returns true, if the tree given might have side effects }
     function might_have_sideeffects(n : tnode) : boolean;
 
+    { count the number of nodes in the node tree,
+      rough estimation how large the tree "node" is }
+    function node_count(node : tnode) : dword;
+
+    { trashes the given temp. node }
+    function trash_tempref(node : tnode) : tnode;
+
 implementation
 
     uses
@@ -1110,4 +1116,51 @@ implementation
         result:=foreachnodestatic(n,@check_for_sideeffect,nil);
       end;
 
+    var
+      nodecount : dword;
+
+    function donodecount(var n: tnode; arg: pointer): foreachnoderesult;
+      begin
+        inc(nodecount);
+        result:=fen_false;
+      end;
+
+
+    { rough estimation how large the tree "node" is }
+    function node_count(node : tnode) : dword;
+      begin
+        nodecount:=0;
+        foreachnodestatic(node,@donodecount,nil);
+        result:=nodecount;
+      end;
+
+
+    function trash_tempref(node : tnode) : tnode;
+      var
+        trashintval: aint;
+      begin
+        if node.nodetype<>tempcreaten then
+          internalerror(2012051901);
+        trashintval := trashintvalues[localvartrashing];
+        case ttempcreatenode(node).size of
+          0: ; { empty record }
+          1: result:=cassignmentnode.create(ctemprefnode.create(ttempcreatenode(node)),
+               ctypeconvnode.create_internal(cordconstnode.create(tconstexprint(byte(trashintval)),u8inttype,false),ttempcreatenode(node).tempinfo^.typedef));
+          2: result:=cassignmentnode.create(ctemprefnode.create(ttempcreatenode(node)),
+               ctypeconvnode.create_internal(cordconstnode.create(word(trashintval),u16inttype,false),ttempcreatenode(node).tempinfo^.typedef));
+          4: result:=cassignmentnode.create(ctemprefnode.create(ttempcreatenode(node)),
+               ctypeconvnode.create_internal(cordconstnode.create(dword(trashintval),u32inttype,false),ttempcreatenode(node).tempinfo^.typedef));
+          8: result:=cassignmentnode.create(ctemprefnode.create(ttempcreatenode(node)),
+               ctypeconvnode.create_internal(cordconstnode.create(qword(trashintval),u64inttype,false),ttempcreatenode(node).tempinfo^.typedef));
+          else
+            begin
+              result:=ccallnode.createintern('fpc_fillmem',
+                ccallparanode.Create(cordconstnode.create(tconstexprint(byte(trashintval)),u8inttype,false),
+                ccallparanode.Create(cordconstnode.create(ttempcreatenode(node).size,uinttype,false),
+                ccallparanode.Create(ctemprefnode.create(ttempcreatenode(node)),nil)))
+                );
+            end;
+        end;
+      end;
+
 end.

compiler/optloop.pas

@@ -46,34 +46,15 @@ unit optloop;
       optbase,optutils,
       procinfo;
 
-    var
-      nodecount : aword;
-
-    function donodecount(var n: tnode; arg: pointer): foreachnoderesult;
-      begin
-        inc(nodecount);
-        result:=fen_false;
-      end;
-
-
-    { rough estimation how large the tree "node" is }
-    function countnodes(node : tnode) : aword;
-      begin
-        nodecount:=0;
-        foreachnodestatic(node,@donodecount,nil);
-        result:=nodecount;
-      end;
-
-
     function number_unrolls(node : tnode) : cardinal;
       begin
 {$ifdef i386}
         { multiply by 2 for CPUs with a long pipeline }
         if current_settings.cputype in [cpu_Pentium4] then
-          number_unrolls:=60 div countnodes(node)
+          number_unrolls:=60 div node_count(node)
         else
 {$endif i386}
-          number_unrolls:=30 div countnodes(node);
+          number_unrolls:=30 div node_count(node);
 
         if number_unrolls=0 then
           number_unrolls:=1;

compiler/pdecsub.pas

@@ -2090,9 +2090,9 @@ const
       handler  : nil;
       pocall   : pocall_none;
       pooption : [po_inline];
-      mutexclpocall : [];
+      mutexclpocall : [pocall_safecall];
       mutexclpotype : [potype_constructor,potype_destructor,potype_class_constructor,potype_class_destructor];
-      mutexclpo     : [po_exports,po_external,po_interrupt,po_virtualmethod]
+      mutexclpo     : [po_exports,po_external,po_interrupt,po_virtualmethod,po_iocheck]
     ),(
       idtok:_INTERNCONST;
       pd_flags : [pd_interface,pd_body,pd_notobject,pd_notobjintf,pd_notrecord,pd_nothelper];

compiler/pexpr.pas

@@ -2648,6 +2648,7 @@ implementation
                            end;
                        end;
                        callflags:=[cnf_inherited];
+                       include(current_procinfo.flags,pi_has_inherited);
                        if anon_inherited then
                          include(callflags,cnf_anon_inherited);
                        do_member_read(hclassdef,getaddr,srsym,p1,again,callflags);

compiler/procinfo.pas

@@ -49,8 +49,8 @@ unit procinfo;
     type
        tsavedlabels = array[Boolean] of TAsmLabel;
 
-       {# This object gives information on the current routine being
-          compiled.
+       { This object gives information on the current routine being
+         compiled.
        }
        tprocinfo = class(tlinkedlistitem)
        private
@@ -60,11 +60,8 @@ unit procinfo;
        public
           { pointer to parent in nested procedures }
           parent : tprocinfo;
-          {# the definition of the routine itself }
+          { the definition of the routine itself }
           procdef : tprocdef;
-          { procinfo of the main procedure that is inlining
-            the current function, only used in tcgcallnode.inlined_pass2 }
-          inlining_procinfo : tprocinfo;
           { nested implicit finalzation procedure, used for platform-specific
             exception handling }
           finalize_procinfo : tprocinfo;
@@ -83,8 +80,8 @@ unit procinfo;
           { Offset of temp after para/local are allocated }
           tempstart : longint;
 
-          {# some collected informations about the procedure
-             see pi_xxxx constants above
+          { some collected informations about the procedure
+            see pi_xxxx constants above
           }
           flags : tprocinfoflags;
 
@@ -113,8 +110,8 @@ unit procinfo;
           { label to leave the sub routine }
           CurrExitLabel : tasmlabel;
 
-          {# The code for the routine itself, excluding entry and
-             exit code. This is a linked list of tai classes.
+          { The code for the routine itself, excluding entry and
+            exit code. This is a linked list of tai classes.
           }
           aktproccode : TAsmList;
           { Data (like jump tables) that belongs to this routine }
@@ -170,7 +167,6 @@ unit procinfo;
        { information about the current sub routine being parsed (@var(pprocinfo))}
        current_procinfo : tprocinfo;
 
-
 implementation
 
      uses

compiler/pstatmnt.pas

@@ -1085,7 +1085,7 @@ implementation
            _GOTO :
              begin
                 if not(cs_support_goto in current_settings.moduleswitches) then
-                 Message(sym_e_goto_and_label_not_supported);
+                  Message(sym_e_goto_and_label_not_supported);
                 consume(_GOTO);
                 if (token<>_INTCONST) and (token<>_ID) then
                   begin
@@ -1129,6 +1129,7 @@ implementation
                              { allowed? }
                              if not(m_non_local_goto in current_settings.modeswitches) then
                                Message(parser_e_goto_outside_proc);
+                             include(current_procinfo.flags,pi_has_global_goto);
                            end;
                          code:=cgotonode.create(tlabelsym(srsym));
                          tgotonode(code).labelsym:=tlabelsym(srsym);

compiler/psub.pas

@@ -31,8 +31,12 @@ interface
       symdef,procinfo,optdfa;
 
     type
+
+      { tcgprocinfo }
+
       tcgprocinfo = class(tprocinfo)
       private
+        procedure CreateInlineInfo;
         procedure maybe_add_constructor_wrapper(var tocode: tnode; withexceptblock: boolean);
         procedure add_entry_exit_code;
         procedure setup_tempgen;
@@ -124,6 +128,71 @@ implementation
        {$endif}
        ;
 
+    function checknodeinlining(procdef: tprocdef): boolean;
+      var
+        i : integer;
+        currpara : tparavarsym;
+      begin
+        result := false;
+        if pi_has_assembler_block in current_procinfo.flags then
+          begin
+            Message1(parser_h_not_supported_for_inline,'assembler');
+            Message(parser_h_inlining_disabled);
+            exit;
+          end;
+        if pi_has_global_goto in current_procinfo.flags then
+          begin
+            Message1(parser_h_not_supported_for_inline,'global goto');
+            Message(parser_h_inlining_disabled);
+            exit;
+          end;
+        { the compiler cannot handle inherited in inlined subroutines because
+          it tries to search for self in the symtable, however, the symtable
+          is not available }
+        if pi_has_inherited in current_procinfo.flags then
+          begin
+            Message1(parser_h_not_supported_for_inline,'inherited');
+            Message(parser_h_inlining_disabled);
+            exit;
+          end;
+        for i:=0 to procdef.paras.count-1 do
+          begin
+            currpara:=tparavarsym(procdef.paras[i]);
+            case currpara.vardef.typ of
+              formaldef :
+                begin
+                  if (currpara.varspez in [vs_out,vs_var,vs_const,vs_constref]) then
+                    begin
+                      Message1(parser_h_not_supported_for_inline,'formal parameter');
+                      Message(parser_h_inlining_disabled);
+                      exit;
+                    end;
+                end;
+              arraydef :
+                begin
+                  if is_array_of_const(currpara.vardef) or
+                     is_variant_array(currpara.vardef) then
+                    begin
+                      Message1(parser_h_not_supported_for_inline,'array of const');
+                      Message(parser_h_inlining_disabled);
+                      exit;
+                    end;
+                  { open arrays might need re-basing of the index, i.e. if you pass
+                    an array[1..10] as open array, you have to add 1 to all index operations
+                    if you directly inline it }
+                  if is_open_array(currpara.vardef) then
+                    begin
+                      Message1(parser_h_not_supported_for_inline,'open array');
+                      Message(parser_h_inlining_disabled);
+                      exit;
+                    end;
+                end;
+            end;
+        end;
+        result:=true;
+      end;
+
+
 {****************************************************************************
                       PROCEDURE/FUNCTION BODY PARSING
 ****************************************************************************}
@@ -952,6 +1021,19 @@ implementation
         add_reg_instruction_hook:[email protected]_reg_instruction;
       end;
 
+
+     procedure TCGProcinfo.CreateInlineInfo;
+       begin
+        new(procdef.inlininginfo);
+        include(procdef.procoptions,po_has_inlininginfo);
+        procdef.inlininginfo^.code:=code.getcopy;
+        procdef.inlininginfo^.flags:=flags;
+        { The blocknode needs to set an exit label }
+        if procdef.inlininginfo^.code.nodetype=blockn then
+          include(procdef.inlininginfo^.code.flags,nf_block_with_exit);
+       end;
+
+
     procedure tcgprocinfo.generate_code;
       var
         old_current_procinfo : tprocinfo;
@@ -992,6 +1074,29 @@ implementation
         current_filepos:=entrypos;
         current_structdef:=procdef.struct;
 
+
+        { automatic inlining? }
+        if (cs_opt_autoinline in current_settings.optimizerswitches) and
+           { inlining not turned off? }
+           (cs_do_inline in current_settings.localswitches) and
+           { no inlining yet? }
+           not(po_has_inlininginfo in procdef.procoptions) and not(has_nestedprocs) and
+            not(procdef.proctypeoption in [potype_proginit,potype_unitinit,potype_unitfinalize,potype_constructor,
+                                           potype_destructor,potype_class_constructor,potype_class_destructor]) and
+            ((procdef.procoptions*[po_exports,po_external,po_interrupt,po_virtualmethod,po_iocheck])=[]) and
+            (not(procdef.proccalloption in [pocall_safecall])) and
+            { rough approximation if we should auto inline }
+            (node_count(code)<=10) then
+          begin
+            { Can we inline this procedure? }
+            if checknodeinlining(procdef) then
+              begin
+                Message1(cg_d_autoinlining,procdef.GetTypeName);
+                include(procdef.procoptions,po_inline);
+                CreateInlineInfo;
+              end;
+          end;
+
         templist:=TAsmList.create;
 
         { add parast/localst to symtablestack }
@@ -1452,56 +1557,6 @@ implementation
        end;
 
 
-    function checknodeinlining(procdef: tprocdef): boolean;
-      var
-        i : integer;
-        currpara : tparavarsym;
-      begin
-        result := false;
-        if (pi_has_assembler_block in current_procinfo.flags) then
-          begin
-            Message1(parser_h_not_supported_for_inline,'assembler');
-            Message(parser_h_inlining_disabled);
-            exit;
-          end;
-        for i:=0 to procdef.paras.count-1 do
-          begin
-            currpara:=tparavarsym(procdef.paras[i]);
-            case currpara.vardef.typ of
-              formaldef :
-                begin
-                  if (currpara.varspez in [vs_out,vs_var,vs_const,vs_constref]) then
-                    begin
-                      Message1(parser_h_not_supported_for_inline,'formal parameter');
-                      Message(parser_h_inlining_disabled);
-                      exit;
-                    end;
-                end;
-              arraydef :
-                begin
-                  if is_array_of_const(currpara.vardef) or
-                     is_variant_array(currpara.vardef) then
-                    begin
-                      Message1(parser_h_not_supported_for_inline,'array of const');
-                      Message(parser_h_inlining_disabled);
-                      exit;
-                    end;
-                  { open arrays might need re-basing of the index, i.e. if you pass
-                    an array[1..10] as open array, you have to add 1 to all index operations
-                    if you directly inline it }
-                  if is_open_array(currpara.vardef) then
-                    begin
-                      Message1(parser_h_not_supported_for_inline,'open array');
-                      Message(parser_h_inlining_disabled);
-                      exit;
-                    end;
-                end;
-            end;
-        end;
-        result:=true;
-      end;
-
-
     procedure tcgprocinfo.parse_body;
       var
          old_current_procinfo : tprocinfo;
@@ -1511,6 +1566,7 @@ implementation
          old_current_genericdef,
          old_current_specializedef: tstoreddef;
          old_parse_generic: boolean;
+
       begin
          old_current_procinfo:=current_procinfo;
          old_block_type:=block_type;
@@ -1615,20 +1671,10 @@ implementation
                end;
            end;
 
-         if (po_inline in procdef.procoptions) then
-           begin
-             { Can we inline this procedure? }
-             if checknodeinlining(procdef) then
-               begin
-                 new(procdef.inlininginfo);
-                 include(procdef.procoptions,po_has_inlininginfo);
-                 procdef.inlininginfo^.code:=code.getcopy;
-                 procdef.inlininginfo^.flags:=flags;
-                 { The blocknode needs to set an exit label }
-                 if procdef.inlininginfo^.code.nodetype=blockn then
-                   include(procdef.inlininginfo^.code.flags,nf_block_with_exit);
-               end;
-           end;
+         if (po_inline in procdef.procoptions) and
+           { Can we inline this procedure? }
+           checknodeinlining(procdef) then
+           CreateInlineInfo;
 
          { Print the node to tree.log }
          if paraprintnodetree=1 then

compiler/utils/ppudump.pp

@@ -993,7 +993,9 @@ procedure readprocinfooptions(space : string);
          { dfa was generated for this proc }
          pi_dfaavailable,
          { subroutine contains interprocedural used labels }
-         pi_has_interproclabel
+         pi_has_interproclabel,
+         { subroutine contains interprocedural gotos }
+         pi_has_global_goto
        ); *)
 
 type
@@ -1037,7 +1039,11 @@ const
          (mask:pi_has_interproclabel;
          str:' subroutine contains interprocedural used labels '),
          (mask:pi_has_unwind_info;
-         str:' unwinding info was generated for this proc ')
+         str:' unwinding info was generated for this proc '),
+         (mask:pi_has_global_goto;
+         str:' subroutine contains interprocedural goto '),
+         (mask:pi_has_inherited;
+         str:' subroutine contains inherited call ')
   );
 var
   procinfooptions : tprocinfoflags;
@@ -1722,7 +1728,7 @@ end;
     ppo_hasparameters,
     ppo_implements,
     ppo_enumerator_current,
-    ppo_overrides,              
+    ppo_overrides,
     ppo_dispid_write              { no longer used }
   );
   tpropertyoptions=set of tpropertyoption;
@@ -1742,7 +1748,7 @@ const
     (mask:ppo_hasparameters;str:'has parameters'),
     (mask:ppo_implements;str:'implements'),
     (mask:ppo_enumerator_current;str:'enumerator current'),
-    (mask:ppo_overrides;str:'overrides'),  
+    (mask:ppo_overrides;str:'overrides'),
     (mask:ppo_dispid_write;str:'dispid write')  { no longer used }
   );
 var

rtl/inc/compproc.inc

@@ -37,6 +37,7 @@ Procedure fpc_freemem(p:pointer);compilerproc;
 
 { used by Default() in code blocks }
 procedure fpc_zeromem(p:pointer;len:ptruint);compilerproc;
+procedure fpc_fillmem(var data;len:ptruint;b : byte);compilerproc;
 
 procedure fpc_Shortstr_SetLength(var s:shortstring;len:SizeInt); compilerproc;
 procedure fpc_shortstr_to_shortstr(out res:shortstring; const sstr: shortstring); compilerproc;

rtl/inc/system.inc

@@ -280,11 +280,18 @@ begin
   CompareChar:=CompareByte(buf1,buf2,len);
 end;
 
+
 procedure fpc_zeromem(p:pointer;len:ptruint);
 begin
   FillChar(p^,len,0);
 end;
 
+
+procedure fpc_fillmem(var data;len:ptruint;b : byte);
+begin
+  FillByte(data,len,b);
+end;
+
 { Include generic pascal only routines which are not defined in the processor
   specific include file }
 {$I generic.inc}

tests/tbs/tb0508.pp

@@ -1,3 +1,5 @@
+{ inlining is not compatible with get_caller_frame/get_frame }
+{$inline off}
 type
   PointerLocal = procedure(_EBP: Pointer);
 

tests/test/tisogoto5.pp

@@ -0,0 +1,34 @@
+{$mode iso}
+{$inline on}
+procedure test;
+  label
+    1;
+  procedure p;
+    begin
+      goto 1;
+      halt(1);
+    end;
+  begin
+    p;
+    halt(1);
+  1:
+  end;
+
+
+label
+  1;
+
+procedure p;inline;
+  begin
+    goto 1;
+    halt(1);
+  end;
+
+begin
+  test;
+  p;
+  halt(1);
+1:
+  writeln('ok');
+end.
+

tests/webtbs/tw16668.pp

@@ -4,9 +4,12 @@ program Project1;
 
 {$mode objfpc}{$H+}
 
-procedure Foo;
+procedure Foo1;
 var
   a: TObject;
+  r: record
+    b : array[0..10] of byte
+  end;
 begin
 {$ifdef cpu32}
   if ptruint(a)<>$55555555 then
@@ -17,6 +20,36 @@ begin
 {$endif}
 end;
 
+procedure Foo2;inline;
+var
+  a: TObject;
+  r: record
+    b : array[0..10] of byte
+  end;
+begin
+{$ifdef cpu32}
+  if ptruint(a)<>$55555555 then
+    halt(1);
+{$else}
+  if ptruint(a)<>$5555555555555555 then
+    halt(1);
+{$endif}
+end;
+
+
+procedure Foo3;inline;
+var
+  r: record
+    b : array[0..10] of byte
+  end;
+begin
+  if r.b[3]<>$55 then
+    halt(1);
+end;
+
 begin
-  Foo;
+  Foo1;
+  Foo2;
+  Foo3;
+  writeln('ok');
 end.

tests/webtbs/tw1677.pp

@@ -1,7 +1,11 @@
 { Source provided for Free Pascal Bug Report 1677 }
 { Submitted by "Anders Lindeberg" on  2001-11-10 }
 { e-mail: [email protected] }
+
+{ inlining causes different ref. counting }
+{$inline off}
 program test;
+
 type trec = record i:integer; s:ansistring end;
 
 procedure RefCount(const s : ansistring;var rc:sizeint;expect:sizeint);
@@ -16,11 +20,7 @@ begin
         then writeln('Nil string.')
         else
 {$ifdef  fpc}
-  {$if defined(ver1_0) or defined(ver1_9_4)}
-         rc:=(p-1)^;
-  {$else}
          rc:=psizeint(pchar(p)-sizeof(sizeint)*2)^;
-  {$endif}
 {$else}
          rc:=plongint(pchar(p)-8)^;
 {$endif}