Merge pull request #134 from jayrm/varargs

Bug fixes for CVA_LIST PTR types

Author: jayrm

src/compiler/ast-node-check.bas

@@ -177,8 +177,10 @@ function astLoadPTRCHK _
 	end if
 
 	'' assign to a temp, can't reuse the same vreg or registers could
-	'' be spilled as IR can't handle inter-blocks
-	t = astNewASSIGN( astNewVAR( n->sym ), l, AST_OPOPT_ISINI )
+	'' be spilled as IR can't handle inter-blocks.
+	'' And don't generate pointer warnings for this internal assignment; as
+	'' in the case where datatypes differ by mangle modifier only.
+	t = astNewASSIGN( astNewVAR( n->sym ), l, AST_OPOPT_ISINI or AST_OPOPT_DONTCHKPTR )
 	astLoad( t )
 	astDelNode( t )
 

src/compiler/ir-hlc.bas

@@ -1957,6 +1957,22 @@ private function exprNewBOP _
 	'' and on pointers only after casting to ubyte* first,
 	'' so no subtype needs to be preserved here.
 
+	'' if both are pointers, and either has a mangle modifier, then
+	'' cast both sides to ubyte*, otherwise, gcc may warn about comparing
+	'' distinct pointer types without a cast.  For example with pointers
+	'' to __builtin_va_list types.  AST should have already rejected
+	'' invalid comparisons or warned on suspicious comparisons.
+	select case as const( op )
+	case AST_OP_EQ, AST_OP_NE, AST_OP_GT, AST_OP_LT, AST_OP_GE, AST_OP_LE
+		if( typeIsPtr( l->dtype ) and typeIsPtr( r->dtype ) ) then
+			if( (typeGetMangleDt( l->dtype ) = FB_DATATYPE_VA_LIST) or _
+				(typeGetMangleDt( r->dtype ) = FB_DATATYPE_VA_LIST) ) then
+				l = exprNewCAST( typeAddrOf( FB_DATATYPE_UBYTE ), NULL, l )
+				r = exprNewCAST( typeAddrOf( FB_DATATYPE_UBYTE ), NULL, r )
+			end if
+		end if
+	end select
+
 	n = exprNew( EXPRCLASS_BOP, dtype, NULL )
 	n->l = l
 	n->r = r

src/compiler/parser-decl-var.bas

@@ -65,6 +65,15 @@ sub hSymbolType _
 		lgt = typeGetSize( dtype )
 	end if
 
+	'' ANY alias "modifier" but no pointer level?
+	if( typeHasMangleDt( dtype ) and (typeGetDtAndPtrOnly( dtype ) = FB_DATATYPE_VOID) ) then
+		errReport( FB_ERRMSG_INVALIDDATATYPES )
+		'' error recovery: fake a type
+		dtype = typeAddrOf( dtype )
+		subtype = NULL
+		lgt = typeGetSize( dtype )
+	end if
+
 end sub
 
 function hCheckScope() as integer

tests/dim/dim-bad-datatype-1.bas

@@ -0,0 +1,3 @@
+' TEST_MODE : COMPILE_ONLY_FAIL
+
+dim x as any alias "char"

tests/functions/va_cva_api.bas

@@ -94,8 +94,8 @@ SUITE( fbc_tests.functions.va_cva_api )
 
 		next
 
-		cva_end( x1 )
-		cva_end( x2 )
+		cva_end( y1 )
+		cva_end( y2 )
 
 	end sub