From 9dd4013046ef64d4ac7d09c336e69a3edf504ded Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sat, 13 Mar 2010 18:07:51 +0100 Subject: [PATCH 2/2] -Wenum-mismatch now works better with conditional op. It used to crash instead of reporting the warnings properly. Reported by Pavel Roskin. Signed-off-by: Kamil Dudka --- evaluate.c | 35 +++++++++++++--- validation/enum-common.c | 15 +++++++ validation/enum-from-int.c | 63 ++++++++++++++++------------ validation/enum-mismatch.c | 100 +++++++++++++++++++++++++++----------------- validation/enum-to-int.c | 42 +++++++++--------- 5 files changed, 163 insertions(+), 92 deletions(-) diff --git a/evaluate.c b/evaluate.c index eb1704a..ec96a71 100644 --- a/evaluate.c +++ b/evaluate.c @@ -8,6 +8,7 @@ * * Evaluate constant expressions. */ +#include #include #include #include @@ -235,7 +236,7 @@ static int is_same_type(struct expression *expr, struct symbol *new) } static void -resolve_sym_node (struct symbol **psym) +resolve_sym_node(struct symbol **psym) { struct symbol *sym = *psym; if (sym->type == SYM_NODE) @@ -243,7 +244,7 @@ resolve_sym_node (struct symbol **psym) } static void -warn_for_different_enum_types (struct expression *expr, struct symbol *typeb) +warn_for_different_enum_types(struct expression *expr, struct symbol *typeb) { struct position pos = expr->pos; struct symbol *typea = expr->ctype; @@ -284,7 +285,7 @@ issue_conversion_warning(struct position pos, } static void -warn_for_enum_to_int_conversion (struct expression *expr, struct symbol *typeb) +warn_for_enum_to_int_conversion(struct expression *expr, struct symbol *typeb) { struct position pos = expr->pos; struct symbol *typea = expr->ctype; @@ -307,7 +308,7 @@ warn_for_enum_to_int_conversion (struct expression *expr, struct symbol *typeb) } static void -warn_for_int_to_enum_conversion (struct expression *expr, struct symbol *typeb) +warn_for_int_to_enum_conversion(struct expression *expr, struct symbol *typeb) { struct position pos = expr->pos; struct symbol *typea = expr->ctype; @@ -329,8 +330,30 @@ warn_for_int_to_enum_conversion (struct expression *expr, struct symbol *typeb) static void warn_for_enum_conversions(struct expression *expr, struct symbol *type) { - warn_for_different_enum_types (expr, type); - warn_for_int_to_enum_conversion (expr, type); + assert(expr); + assert(type); + + /* look through implied cast(s) */ + while (expr->type == EXPR_IMPLIED_CAST) + expr = expr->cast_expression; + + switch (expr->type) { + case EXPR_SELECT: + /* EXPR_SELECT should not appear in the evaluate stage */ + assert(0); + + case EXPR_CONDITIONAL: + warn_for_enum_conversions(expr->cond_true + /* handle the "?:" quirk */ + ?: expr->conditional, + type); + warn_for_enum_conversions(expr->cond_false, type); + break; + + default: + warn_for_different_enum_types(expr, type); + warn_for_int_to_enum_conversion(expr, type); + } } /* diff --git a/validation/enum-common.c b/validation/enum-common.c index 4685cdf..24fef59 100644 --- a/validation/enum-common.c +++ b/validation/enum-common.c @@ -47,6 +47,10 @@ static void always_ok(void) default: take_int(VALUE_C); } + + var_a = var_b ? var_a : VALUE_A; + var_b = VALUE_A ? VALUE_B : var_b; + take_enum_of_type_a(var_a ?: var_a); } static void trigger_enum_mismatch(void) @@ -75,6 +79,13 @@ static void trigger_enum_mismatch(void) var_a = VALUE_B; var_b = VALUE_C; anon_enum_var = VALUE_A; + + // conditional operator + anon_enum_var = i ? VALUE_A : VALUE_B; + var_a = anon_enum_var ? VALUE_A : VALUE_B; + var_b = anon_enum_var ? VALUE_A : VALUE_B; + take_enum_of_type_a(var_a ?: var_b); + take_enum_of_type_a(var_b ?: var_a); } static void trigger_int_to_enum_conversion(void) @@ -91,6 +102,10 @@ static void trigger_int_to_enum_conversion(void) anon_enum_var = i; var_a = (int) VALUE_A; var_a = (int) VALUE_B; + + // conditional operator + take_enum_of_type_a(var_a ?: i); + take_enum_of_type_a(i ?: var_a); } static void trigger_enum_to_int_conversion(void) diff --git a/validation/enum-from-int.c b/validation/enum-from-int.c index 4dc63a8..6465235 100644 --- a/validation/enum-from-int.c +++ b/validation/enum-from-int.c @@ -5,32 +5,41 @@ * check-command: sparse -Wno-enum-mismatch $file * * check-error-start -enum-common.c:85:45: warning: conversion of -enum-common.c:85:45: int to -enum-common.c:85:45: int enum ENUM_TYPE_A -enum-common.c:86:45: warning: conversion of -enum-common.c:86:45: int to -enum-common.c:86:45: int enum ENUM_TYPE_A -enum-common.c:83:22: warning: conversion of -enum-common.c:83:22: int to -enum-common.c:83:22: int enum ENUM_TYPE_A -enum-common.c:88:17: warning: conversion of -enum-common.c:88:17: int to -enum-common.c:88:17: int enum ENUM_TYPE_A -enum-common.c:89:17: warning: conversion of -enum-common.c:89:17: int to -enum-common.c:89:17: int enum ENUM_TYPE_B -enum-common.c:90:25: warning: conversion of -enum-common.c:90:25: int to -enum-common.c:90:25: int enum -enum-common.c:91:25: warning: conversion of -enum-common.c:91:25: int to -enum-common.c:91:25: int enum -enum-common.c:92:18: warning: conversion of -enum-common.c:92:18: int to -enum-common.c:92:18: int enum ENUM_TYPE_A -enum-common.c:93:18: warning: conversion of -enum-common.c:93:18: int to -enum-common.c:93:18: int enum ENUM_TYPE_A +enum-common.c:96:45: warning: conversion of +enum-common.c:96:45: int to +enum-common.c:96:45: int enum ENUM_TYPE_A +enum-common.c:97:45: warning: conversion of +enum-common.c:97:45: int to +enum-common.c:97:45: int enum ENUM_TYPE_A +enum-common.c:94:22: warning: conversion of +enum-common.c:94:22: int to +enum-common.c:94:22: int enum ENUM_TYPE_A +enum-common.c:99:17: warning: conversion of +enum-common.c:99:17: int to +enum-common.c:99:17: int enum ENUM_TYPE_A +enum-common.c:100:17: warning: conversion of +enum-common.c:100:17: int to +enum-common.c:100:17: int enum ENUM_TYPE_B +enum-common.c:101:25: warning: conversion of +enum-common.c:101:25: int to +enum-common.c:101:25: int enum +enum-common.c:102:25: warning: conversion of +enum-common.c:102:25: int to +enum-common.c:102:25: int enum +enum-common.c:103:18: warning: conversion of +enum-common.c:103:18: int to +enum-common.c:103:18: int enum ENUM_TYPE_A +enum-common.c:104:18: warning: conversion of +enum-common.c:104:18: int to +enum-common.c:104:18: int enum ENUM_TYPE_A +enum-common.c:107:38: warning: conversion of +enum-common.c:107:38: int to +enum-common.c:107:38: int enum ENUM_TYPE_A +enum-common.c:108:29: warning: conversion of +enum-common.c:108:29: int to +enum-common.c:108:29: int enum ENUM_TYPE_A +enum-common.c:108:29: warning: conversion of +enum-common.c:108:29: int to +enum-common.c:108:29: int enum ENUM_TYPE_A * check-error-end */ diff --git a/validation/enum-mismatch.c b/validation/enum-mismatch.c index b1a4369..d8d34dc 100644 --- a/validation/enum-mismatch.c +++ b/validation/enum-mismatch.c @@ -5,44 +5,68 @@ * check-command: sparse -Wenum-mismatch -Wno-int-to-enum $file * * check-error-start -enum-common.c:58:45: warning: mixing different enum types -enum-common.c:58:45: int enum ENUM_TYPE_B versus -enum-common.c:58:45: int enum ENUM_TYPE_A -enum-common.c:59:45: warning: mixing different enum types -enum-common.c:59:45: int enum ENUM_TYPE_B versus -enum-common.c:59:45: int enum ENUM_TYPE_A -enum-common.c:55:22: warning: mixing different enum types -enum-common.c:55:22: int enum ENUM_TYPE_B versus -enum-common.c:55:22: int enum ENUM_TYPE_A -enum-common.c:56:22: warning: mixing different enum types -enum-common.c:56:22: int enum versus -enum-common.c:56:22: int enum ENUM_TYPE_A -enum-common.c:65:45: warning: mixing different enum types -enum-common.c:65:45: int enum versus -enum-common.c:65:45: int enum ENUM_TYPE_A -enum-common.c:66:45: warning: mixing different enum types -enum-common.c:66:45: int enum versus -enum-common.c:66:45: int enum ENUM_TYPE_A -enum-common.c:63:22: warning: mixing different enum types -enum-common.c:63:22: int enum ENUM_TYPE_A versus -enum-common.c:63:22: int enum -enum-common.c:70:17: warning: mixing different enum types -enum-common.c:70:17: int enum ENUM_TYPE_B versus -enum-common.c:70:17: int enum ENUM_TYPE_A -enum-common.c:71:17: warning: mixing different enum types -enum-common.c:71:17: int enum versus -enum-common.c:71:17: int enum ENUM_TYPE_B -enum-common.c:72:25: warning: mixing different enum types -enum-common.c:72:25: int enum ENUM_TYPE_A versus -enum-common.c:72:25: int enum +enum-common.c:62:45: warning: mixing different enum types +enum-common.c:62:45: int enum ENUM_TYPE_B versus +enum-common.c:62:45: int enum ENUM_TYPE_A +enum-common.c:63:45: warning: mixing different enum types +enum-common.c:63:45: int enum ENUM_TYPE_B versus +enum-common.c:63:45: int enum ENUM_TYPE_A +enum-common.c:59:22: warning: mixing different enum types +enum-common.c:59:22: int enum ENUM_TYPE_B versus +enum-common.c:59:22: int enum ENUM_TYPE_A +enum-common.c:60:22: warning: mixing different enum types +enum-common.c:60:22: int enum versus +enum-common.c:60:22: int enum ENUM_TYPE_A +enum-common.c:69:45: warning: mixing different enum types +enum-common.c:69:45: int enum versus +enum-common.c:69:45: int enum ENUM_TYPE_A +enum-common.c:70:45: warning: mixing different enum types +enum-common.c:70:45: int enum versus +enum-common.c:70:45: int enum ENUM_TYPE_A +enum-common.c:67:22: warning: mixing different enum types +enum-common.c:67:22: int enum ENUM_TYPE_A versus +enum-common.c:67:22: int enum +enum-common.c:74:17: warning: mixing different enum types +enum-common.c:74:17: int enum ENUM_TYPE_B versus +enum-common.c:74:17: int enum ENUM_TYPE_A enum-common.c:75:17: warning: mixing different enum types -enum-common.c:75:17: int enum ENUM_TYPE_B versus -enum-common.c:75:17: int enum ENUM_TYPE_A -enum-common.c:76:17: warning: mixing different enum types -enum-common.c:76:17: int enum versus -enum-common.c:76:17: int enum ENUM_TYPE_B -enum-common.c:77:25: warning: mixing different enum types -enum-common.c:77:25: int enum ENUM_TYPE_A versus -enum-common.c:77:25: int enum +enum-common.c:75:17: int enum versus +enum-common.c:75:17: int enum ENUM_TYPE_B +enum-common.c:76:25: warning: mixing different enum types +enum-common.c:76:25: int enum ENUM_TYPE_A versus +enum-common.c:76:25: int enum +enum-common.c:79:17: warning: mixing different enum types +enum-common.c:79:17: int enum ENUM_TYPE_B versus +enum-common.c:79:17: int enum ENUM_TYPE_A +enum-common.c:80:17: warning: mixing different enum types +enum-common.c:80:17: int enum versus +enum-common.c:80:17: int enum ENUM_TYPE_B +enum-common.c:81:25: warning: mixing different enum types +enum-common.c:81:25: int enum ENUM_TYPE_A versus +enum-common.c:81:25: int enum +enum-common.c:84:29: warning: mixing different enum types +enum-common.c:84:29: int enum ENUM_TYPE_A versus +enum-common.c:84:29: int enum +enum-common.c:84:39: warning: mixing different enum types +enum-common.c:84:39: int enum ENUM_TYPE_B versus +enum-common.c:84:39: int enum +enum-common.c:85:43: warning: mixing different enum types +enum-common.c:85:43: int enum ENUM_TYPE_B versus +enum-common.c:85:43: int enum ENUM_TYPE_A +enum-common.c:86:33: warning: mixing different enum types +enum-common.c:86:33: int enum ENUM_TYPE_A versus +enum-common.c:86:33: int enum ENUM_TYPE_B +enum-common.c:87:29: warning: mixing different enum types +enum-common.c:87:29: int enum ENUM_TYPE_A versus +enum-common.c:87:29: int enum ENUM_TYPE_B +enum-common.c:87:38: warning: mixing different enum types +enum-common.c:87:38: int enum ENUM_TYPE_B versus +enum-common.c:87:38: int enum ENUM_TYPE_A +enum-common.c:88:29: warning: mixing different enum types +enum-common.c:88:29: int enum ENUM_TYPE_B versus +enum-common.c:88:29: int enum ENUM_TYPE_A +enum-common.c:88:29: warning: mixing different enum types +enum-common.c:88:29: int enum ENUM_TYPE_B versus +enum-common.c:88:29: int enum ENUM_TYPE_A * check-error-end */ diff --git a/validation/enum-to-int.c b/validation/enum-to-int.c index 78a31e9..68c43fd 100644 --- a/validation/enum-to-int.c +++ b/validation/enum-to-int.c @@ -5,26 +5,26 @@ * check-command: sparse -Wenum-to-int -Wno-enum-mismatch -Wno-int-to-enum $file * * check-error-start -enum-common.c:98:21: warning: conversion of -enum-common.c:98:21: int enum ENUM_TYPE_A to -enum-common.c:98:21: int -enum-common.c:99:13: warning: conversion of -enum-common.c:99:13: int enum ENUM_TYPE_A to -enum-common.c:99:13: int -enum-common.c:100:13: warning: conversion of -enum-common.c:100:13: int enum ENUM_TYPE_B to -enum-common.c:100:13: int -enum-common.c:105:34: warning: conversion of -enum-common.c:105:34: int enum ENUM_TYPE_A to -enum-common.c:105:34: int -enum-common.c:106:34: warning: conversion of -enum-common.c:106:34: int enum ENUM_TYPE_B to -enum-common.c:106:34: int -enum-common.c:102:22: warning: conversion of -enum-common.c:102:22: int enum ENUM_TYPE_A to -enum-common.c:102:22: int -enum-common.c:103:22: warning: conversion of -enum-common.c:103:22: int enum ENUM_TYPE_B to -enum-common.c:103:22: int +enum-common.c:113:21: warning: conversion of +enum-common.c:113:21: int enum ENUM_TYPE_A to +enum-common.c:113:21: int +enum-common.c:114:13: warning: conversion of +enum-common.c:114:13: int enum ENUM_TYPE_A to +enum-common.c:114:13: int +enum-common.c:115:13: warning: conversion of +enum-common.c:115:13: int enum ENUM_TYPE_B to +enum-common.c:115:13: int +enum-common.c:120:34: warning: conversion of +enum-common.c:120:34: int enum ENUM_TYPE_A to +enum-common.c:120:34: int +enum-common.c:121:34: warning: conversion of +enum-common.c:121:34: int enum ENUM_TYPE_B to +enum-common.c:121:34: int +enum-common.c:117:22: warning: conversion of +enum-common.c:117:22: int enum ENUM_TYPE_A to +enum-common.c:117:22: int +enum-common.c:118:22: warning: conversion of +enum-common.c:118:22: int enum ENUM_TYPE_B to +enum-common.c:118:22: int * check-error-end */ -- 1.7.0.2