diff --git a/compiler/globtype.pas b/compiler/globtype.pas index 6c6219fcfb..bfc1548d37 100644 --- a/compiler/globtype.pas +++ b/compiler/globtype.pas @@ -79,7 +79,7 @@ interface { codegen } cs_check_overflow,cs_check_range,cs_check_object, cs_check_io,cs_check_stack, - cs_checkpointer, + cs_checkpointer,cs_check_ordinal_size, cs_generate_stackframes,cs_do_assertion,cs_generate_rtti, cs_full_boolean_eval,cs_typed_const_writable,cs_allow_enum_calc, cs_do_inline,cs_fpu_fwait, diff --git a/compiler/htypechk.pas b/compiler/htypechk.pas index 822adb0807..6770e0999e 100644 --- a/compiler/htypechk.pas +++ b/compiler/htypechk.pas @@ -2556,10 +2556,8 @@ implementation procedure check_ranges(const location: tfileposinfo; source: tnode; destdef: tdef); begin - {These checks create too much false positives. They might be usefull if we have - TP styled common type arithmetic semantics, but with the current semantics - there are not usefull.} - {$ifdef check_ranges_warnings} + if not(cs_check_ordinal_size in current_settings.localswitches) then + exit; { check if the assignment may cause a range check error } { if its not explicit, and only if the values are } { ordinals, enumdef and floatdef } @@ -2579,7 +2577,6 @@ implementation MessagePos(location,type_h_smaller_possible_range_check); end; end; - {$endif} end; diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index d5c2c2a706..d01ef24eab 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2494,6 +2494,7 @@ S*2Aas_Assemble using GNU AS **2Ci_IO-checking **2Cn_Omit linking stage **2Co_Check overflow of integer operations +**2CO_Check for possible overflow of integer operations **2Cp_Select instruction set, see fpc -i for possible values **2CP=_ packing settings **3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 and 8 diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 68bcc59199..cfe0095eff 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -731,7 +731,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 45254; + MsgTxtSize = 45310; MsgIdxMax : array[1..20] of longint=( 24,86,237,83,63,50,107,22,135,60, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index c59eb9d3a0..32072c31ac 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -878,209 +878,210 @@ const msgtxt : array[0..000188,1..240] of char=( '**2Ci_IO-c','hecking'#010+ '**2Cn_Omit linking stage'#010+ '**2Co_Check overflow of integer operations'#010+ + '**2CO_Check for possible 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, 4', - ' and 8'#010+ + '**3CPPACKSET=','_ 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 symbo','l '#010+ '**1D_Generate a DEF file'#010+ - '**2Dd_Set description ','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+ - '**2F','c_Set input codepage to '#010+ + '**2Fa[,y]_(for a pr','ogram) 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+ + '**2Ff','_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<','x>_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 checks fo','r pointers'#010+ + '*g1g_Generate debug informat','ion (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',')'+ - #010+ + '*g3godwarfse','ts_ 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 (same as',' -gw2)'#010+ + '*g2gv_Generates programs traceable with va','lgrind'#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_Return ','full compiler version'#010+ '**2iSO_Return compiler OS'#010+ - '**2iSP_R','eturn 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 language',' mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '**2Mo','bjfpc_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 optimiz','ations'#010+ + '**1n_Do not',' 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 optimi','zations)'#010+ + '**2O1_Level 1 optimizations (quick and debugger f','riendly)'#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 values'+ - #010+ - '*','*2Os_Optimize for size rather than speed'#010+ + '**2Op_Set tar','get 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 style ','assembler'#010+ + '3*2Ra','tt_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 (default ','in -Mtp and -Mdelphi)'#010+ + '**3*_h : Compiler also',' 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 interface',' (default)'#010+ + '**2SI_Set ','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 (de','fault in Delphi/ObjFPC modes)'#010+ + '**2St_Allow stati','c 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*2Temx_','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 (clib)',#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ - '3*2Topenbsd_O','penBSD'#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*2Tlinux','_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 P','owerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ - 'P*2Tmacos_Mac OS (clas','sic) 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+ - '**2Us_Co','mpile a system unit'#010+ + '**2Ur_Generate rele','ase 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 ever','ything 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 options (t','argets)'#010+ + '**2*_ l','ots 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 library (','Darwin)'#010+ + 'P*2Wb_Create a bundle instead of a libra','ry (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 type a','pplication (Classic Mac OS)'#010+ + 'A*2WC_Specify console',' 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 applic','ation (EMX, OS/2, Windows)'#010+ + '3*2WF_Specify full-screen type a','pplication (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 code,',' needed for debugging (Windows'+ + '3*2WN_Do not generate relocation code, needed for de','bugging (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 linker (','BeOS, Darwin, FreeBSD, L'+ - 'inux)'#010+ + '**1X_Executab','le 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_L','INK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ - '**2Xm_Generate li','nk 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 f','or 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 lin','ker)'#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/options.pas b/compiler/options.pas index 812bb7ec4f..4d04c9d490 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -534,6 +534,11 @@ begin exclude(init_settings.localswitches,cs_check_overflow) Else include(init_settings.localswitches,cs_check_overflow); + 'O' : + If UnsetBool(More, j) then + exclude(init_settings.localswitches,cs_check_ordinal_size) + Else + include(init_settings.localswitches,cs_check_ordinal_size); 'p' : begin s:=upper(copy(more,j+1,length(more)-j)); diff --git a/tests/webtbf/tw4737.pp b/tests/webtbf/tw4737.pp index 1e1d0dd972..37299c3037 100644 --- a/tests/webtbf/tw4737.pp +++ b/tests/webtbf/tw4737.pp @@ -1,5 +1,5 @@ { %fail } -{ %OPT=-Sewnh -vh} +{ %OPT=-CO -Sewnh -vh} { changed -Seh to -Sewnh because -Cr option changes the hint into a warning PM }