Merge pull request #94 from jayrm/cast-conv-ptr

cast-conv-ptr: do not show new function pointer warnings by default

- make default warnings same/similar quantity as fb 1.05.  New warnings should only be shown when '-w funcptr' or '-w constness' given.  
- '-w funcptr' will check function pointer casts inside CAST()/CPTR()
- '-w funcptr' implies '-w all'
- '-w constness' implies '-w funcptr' & '-w all'
- new internal AST_CONVOPT_DONTWARNFUNCPTR conversion option to be used from hCast()
- the new messages for '-w funcptr' checks are bumped down one level so that they are not generated by default (even though looks a little weird that the warning level is output as (-1), this is correct for now)

Author: jayrm

src/compiler/ast-node-conv.bas

@@ -492,22 +492,36 @@ function astNewCONV _
 
 		n->cast.convconst = ( symbCheckConstAssign( to_dtype, ldtype, to_subtype, l->subtype, , , wrnmsg ) = FALSE )
 
+		'' -w funcptr  -w constness
+		''    no           no          don't warn anything         
+		''    yes          yes         warn everything
+		''    yes          no          warn if wrnmsg<>0
+		''    no           yes         warn everything (-w constness implies -w funcptr)
+
 		'' else check if const conversion
 		if( n->cast.convconst ) then
-			if( (options and AST_CONVOPT_DONTWARNCONST) = 0 ) then
-				if( fbPdCheckIsSet( FB_PDCHECK_CONSTNESS ) ) then
-					'' specific warning message takes priority over const warning
-					if( wrnmsg = 0 ) then
-						wrnmsg = FB_WARNINGMSG_CONSTQUALIFIERDISCARDED
+
+			'' wrnmsg is <> 0 only if funcptr check failed
+			'' specific warning message takes priority over const warning
+			if( wrnmsg <> 0 ) then
+				if( (options and AST_CONVOPT_DONTWARNFUNCPTR) = 0 ) then
+					errReportWarn( wrnmsg, , , strptr(" in function pointer") )
+				end if
+
+			'' else, must be const warning
+			else
+
+				if( (options and AST_CONVOPT_DONTWARNCONST) = 0 ) then
+					if( fbPdCheckIsSet( FB_PDCHECK_CONSTNESS ) ) then
+						errReportWarn( FB_WARNINGMSG_CONSTQUALIFIERDISCARDED )
 					end if
 				end if
+
 			end if
+
 		end if
 
-		'' warning? show it now
-		if( wrnmsg <> 0 ) then
-			errReportWarn( wrnmsg )
-		end if
+
 	end if
 
 	if( env.clopt.backend = FB_BACKEND_GAS ) then

src/compiler/ast.bi

@@ -531,6 +531,7 @@ enum AST_CONVOPT
 	AST_CONVOPT_PTRONLY  = &h4
 	AST_CONVOPT_DONTCHKPTR = &h8
 	AST_CONVOPT_DONTWARNCONST = &h10
+	AST_CONVOPT_DONTWARNFUNCPTR = &h20
 end enum
 
 declare function astNewCONV _

src/compiler/error.bas

@@ -82,10 +82,10 @@ declare function hMakeParamDesc _
 		( 1, @"" ), _  '' FB_WARNINGMSG_AMBIGIOUSLENSIZEOF
 		( 0, @"Suspicious logic operation, mixed boolean and non-boolean operands" ), _
 		( 0, @"Redefinition of intrinsic" ), _
-		( 0, @"CONST qualifier discarded" ), _
-		( 0, @"Return type mismatch" ), _
-		( 0, @"Calling convention mismatch" ), _
-		( 0, @"Argument count mismatch" ) _
+		(-1, @"CONST qualifier discarded" ), _
+		(-1, @"Return type mismatch" ), _
+		(-1, @"Calling convention mismatch" ), _
+		(-1, @"Argument count mismatch" ) _
 	}
 
 	dim shared errorMsgs( 1 to FB_ERRMSGS-1 ) as const zstring ptr => _

src/compiler/error.bi

@@ -380,6 +380,10 @@ enum FB_WARNINGMSG
 	FB_WARNINGMSGS
 end enum
 
+const FB_WARNINGMSGS_LOWEST_LEVEL = -1
+const FB_WARNINGMSGS_DEFAULT_LEVEL = 0
+const FB_WARNINGMSGS_HIGHEST_LEVEL = 2
+
 enum FB_ERRMSGOPT
 	FB_ERRMSGOPT_NONE 		= &h00000000
 	FB_ERRMSGOPT_ADDCOMMA 	= &h00000001

src/compiler/fb.bas

@@ -466,7 +466,7 @@ sub fbGlobalInit()
 	env.clopt.resumeerr     = FALSE
 	env.clopt.profile       = FALSE
 
-	env.clopt.warninglevel  = 0
+	env.clopt.warninglevel  = FB_WARNINGMSGS_DEFAULT_LEVEL
 	env.clopt.showerror     = TRUE
 	env.clopt.maxerrors     = FB_DEFAULT_MAXERRORS
 	env.clopt.pdcheckopt    = FB_PDCHECK_NONE

src/compiler/fb.bi

@@ -106,11 +106,12 @@ enum FB_PDCHECK
 	FB_PDCHECK_NEXTVAR      = &h00000008
 	FB_PDCHECK_CASTTONONPTR = &h00000010
 	FB_PDCHECK_SIGNEDNESS   = &h00000020
-	FB_PDCHECK_CONSTNESS    = &h00000040
+	FB_PDCHECK_CASTFUNCPTR  = &h00000040
+	FB_PDCHECK_CONSTNESS    = &h00000080
 
 	FB_PDCHECK_ALL          = &hffffffff
 
-	FB_PDCHECK_DEFAULT      = FB_PDCHECK_ALL xor ( FB_PDCHECK_NEXTVAR or FB_PDCHECK_SIGNEDNESS or FB_PDCHECK_CONSTNESS )
+	FB_PDCHECK_DEFAULT      = FB_PDCHECK_ALL xor ( FB_PDCHECK_NEXTVAR or FB_PDCHECK_SIGNEDNESS or FB_PDCHECK_CASTFUNCPTR or FB_PDCHECK_CONSTNESS )
 end enum
 
 '' cpu types
@@ -249,7 +250,7 @@ type FBCMMLINEOPT
 	profile         as integer              '' build profiling code (default = false)
 
 	'' error/warning reporting behaviour
-	warninglevel    as integer              '' (default = 0)
+	warninglevel    as integer              '' (default = FB_WARNINGMSGS_DEFAULT_LEVEL)
 	showerror       as integer              '' show line giving error (default = true)
 	maxerrors       as integer              '' max number errors the parser will show
 	pdcheckopt      as FB_PDCHECK           '' pedantic checks

src/compiler/fbc.bas

@@ -1816,11 +1816,14 @@ private sub handleOpt(byval optid as integer, byref arg as string)
 		fbc.showversion = TRUE
 
 	case OPT_W
-		dim as integer value = -2
+		dim as integer value = FB_WARNINGMSGS_LOWEST_LEVEL - 1
 
 		select case (arg)
 		case "all"
-			value = -1
+			value = FB_WARNINGMSGS_LOWEST_LEVEL
+
+		case "none"
+			value = FB_WARNINGMSGS_HIGHEST_LEVEL + 1
 
 		case "param"
 			fbSetOption( FB_COMPOPT_PEDANTICCHK, _
@@ -1841,16 +1844,24 @@ private sub handleOpt(byval optid as integer, byref arg as string)
 		case "constness"
 			fbSetOption( FB_COMPOPT_PEDANTICCHK, _
 						 fbGetOption( FB_COMPOPT_PEDANTICCHK ) or FB_PDCHECK_CONSTNESS )
+			value = FB_WARNINGMSGS_LOWEST_LEVEL
+
+		case "funcptr"
+			fbSetOption( FB_COMPOPT_PEDANTICCHK, _
+						 fbGetOption( FB_COMPOPT_PEDANTICCHK ) or FB_PDCHECK_CASTFUNCPTR )
+			value = FB_WARNINGMSGS_LOWEST_LEVEL
 
 		case "pedantic"
 			fbSetOption( FB_COMPOPT_PEDANTICCHK, FB_PDCHECK_DEFAULT )
-			value = -1
+			if( value > FB_WARNINGMSGS_DEFAULT_LEVEL ) then
+				value = FB_WARNINGMSGS_DEFAULT_LEVEL
+			end if
 
 		case else
 			value = clng( arg )
 		end select
 
-		if( value >= -1 ) then
+		if( value >= FB_WARNINGMSGS_LOWEST_LEVEL ) then
 			fbSetOption( FB_COMPOPT_WARNINGLEVEL, value )
 		end if
 

src/compiler/parser-expr-unary.bas

@@ -362,6 +362,13 @@ private function hCast( byval options as AST_CONVOPT ) as ASTNODE ptr
 	end if
 
 	options or= AST_CONVOPT_CHECKSTR
+
+	'' -w constness implies -w funcptr
+	if( (fbPdCheckIsSet( FB_PDCHECK_CASTFUNCPTR ) = FALSE) _
+		and (fbPdCheckIsSet( FB_PDCHECK_CONSTNESS ) = FALSE) ) then
+		options or= AST_CONVOPT_DONTWARNFUNCPTR
+	end if
+
 	expr = astNewCONV( dtype, subtype, expr, options, @errmsg )
 	if( expr = NULL ) then
 		if( errmsg = FB_ERRMSG_OK ) then

src/compiler/symb.bas

@@ -2086,8 +2086,6 @@ function symbCheckConstAssign _
 
 	dim ret as integer = any
 
-	wrnmsg = 0            '' FB_WARNINGMSG
-	
 	'' check top-level const
 	ret = symbCheckConstAssignTopLevel( ldtype, rdtype, lsubtype, rsubtype, mode, matches )
 

tests/warnings/r/dos/ptr-callconv.txt

@@ -1,31 +1,31 @@
 no warnings:
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer