Skip to content

Commit 0ec55ad

Browse files
tautschnigtautschnig
authored
Merge pull request #1036 from mgudemann/fix/unused-vars-in-assert
Fix unused variables that only appear in `assert`
2 parents 5dbd3a2 + 5d973eb commit 0ec55ad

15 files changed

+108
-69
lines changed

‎src/ic3/aux_types.hh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ Author: Eugene Goldberg, [email protected]
66
77
******************************************************/
88

9+
#include <queue>
910
#include <string>
1011

12+
#include "minisat/core/Solver.h"
13+
#include "minisat/simp/SimpSolver.h"
14+
1115
#ifndef UNUSED
1216
#ifdef _MSC_VER
1317
#define UNUSED

‎src/ic3/build_prob/g3en_cnf.cc

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ Module: CNF Generation (Part 4)
55
Author: Eugene Goldberg, [email protected]
66
77
******************************************************/
8+
#include <util/invariant.h>
9+
10+
#include "ccircuit.hh"
11+
#include "dnf_io.hh"
12+
#include "m0ic3.hh"
13+
14+
#include <algorithm>
815
#include <iostream>
9-
#include <set>
1016
#include <map>
11-
#include <algorithm>
1217
#include <queue>
18+
#include <set>
1319

1420
#include "minisat/core/Solver.h"
1521
#include "minisat/simp/SimpSolver.h"
16-
#include "dnf_io.hh"
17-
#include "ccircuit.hh"
18-
#include "m0ic3.hh"
19-
2022

2123
/*=======================================
2224
@@ -48,7 +50,7 @@ void CompInfo::gen_constr_coi(CUBE &Gates,bool &tran_flag,bool &fun_flag,
4850

4951
assert(Stack.size() == 1);
5052
Gate &G = N->get_gate(Stack.back());
51-
assert(G.flags.label == 0);
53+
INVARIANT(G.flags.label == 0, "Gate label should be zero.");
5254

5355
CUBE Labelled;
5456

‎src/ic3/dnf_io.hh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@ Author: Eugene Goldberg, [email protected]
77
88
******************************************************/
99

10+
#ifndef DNF_IO_HH
11+
#define DNF_IO_HH
12+
13+
#include <deque>
1014
#include <iosfwd>
15+
#include <map>
16+
#include <set>
17+
#include <vector>
1118

1219
typedef std::vector<int> CUBE;
1320
typedef std::vector<CUBE> DNF;
@@ -20,11 +27,6 @@ typedef std::set<int> SCUBE;
2027
typedef DNF CNF;
2128
typedef std::vector <float> FltCube;
2229

23-
24-
#define BUF_SIZE 1000
25-
#define MAX_NUM 20
26-
27-
2830
/*========================
2931
3032
C L A S S comp_lits
@@ -72,4 +74,4 @@ void print_srt_dnf(DNF &D);
7274
void fprint_srt_dnf(DNF &D,char *fname);
7375
void fprint_srt_dnf(DNF &D,const char *fname);
7476

75-
77+
#endif

‎src/ic3/e4xclude_state.cc

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@ Module: Excludes a state from which a bad state is
66
Author: Eugene Goldberg, [email protected]
77
88
******************************************************/
9-
#include <queue>
10-
#include <set>
11-
#include <map>
9+
#include <util/invariant.h>
10+
11+
#include "ccircuit.hh"
12+
#include "dnf_io.hh"
13+
#include "m0ic3.hh"
14+
1215
#include <algorithm>
1316
#include <iostream>
17+
#include <map>
18+
#include <queue>
19+
#include <set>
20+
1421
#include "minisat/core/Solver.h"
1522
#include "minisat/simp/SimpSolver.h"
16-
#include "dnf_io.hh"
17-
#include "ccircuit.hh"
18-
#include "m0ic3.hh"
1923

2024
/*=========================================
2125
@@ -91,7 +95,7 @@ void CompInfo::form_res_cnf(CNF &G,int tf_ind,CUBE &St_cube)
9195
add_assumps1(Assmps,St_cube);
9296

9397
bool sat_form = Slvr.Mst->solve(Assmps);
94-
assert(sat_form == false);
98+
INVARIANT(sat_form == false, "SAT check should fail here.");
9599
CLAUSE C;
96100
gen_assump_clause(C,Slvr,Assmps);
97101
G.push_back(C);

‎src/ic3/i1nit.cc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ Module: Initialization of IC3
55
Author: Eugene Goldberg, [email protected]
66
77
******************************************************/
8+
#include <util/invariant.h>
9+
10+
#include "ccircuit.hh"
11+
#include "dnf_io.hh"
12+
#include "m0ic3.hh"
13+
14+
#include <algorithm>
815
#include <iostream>
16+
#include <map>
917
#include <queue>
1018
#include <set>
11-
#include <map>
12-
#include <algorithm>
19+
1320
#include "minisat/core/Solver.h"
1421
#include "minisat/simp/SimpSolver.h"
15-
#include "dnf_io.hh"
16-
#include "ccircuit.hh"
17-
#include "m0ic3.hh"
1822
/*==============================
1923
2024
C I _ I N I T
@@ -214,7 +218,7 @@ void CompInfo::form_cex()
214218
add_assumps1(Assmps,Cex[i]);
215219
add_assumps1(Assmps,Inp_trace[i]);
216220
bool sat_form = check_sat2(Gen_sat,Assmps);
217-
assert(sat_form);
221+
INVARIANT(sat_form, "SAT check should fail here.");
218222
CUBE Nst,St;
219223
extr_cut_assgns1(Nst,Next_svars,Gen_sat);
220224
conv_to_pres_state(St,Nst);

‎src/ic3/i2nit_sat_solvers.cc

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ Module: Initialization of Sat-solvers (Part 1)
55
Author: Eugene Goldberg, [email protected]
66
77
******************************************************/
8+
#include <util/invariant.h>
9+
10+
#include "ccircuit.hh"
11+
#include "dnf_io.hh"
12+
#include "m0ic3.hh"
13+
14+
#include <algorithm>
15+
#include <map>
816
#include <queue>
917
#include <set>
10-
#include <map>
11-
#include <algorithm>
18+
1219
#include "minisat/core/Solver.h"
1320
#include "minisat/simp/SimpSolver.h"
14-
#include "dnf_io.hh"
15-
#include "ccircuit.hh"
16-
#include "m0ic3.hh"
1721

1822
/*======================================
1923
@@ -141,7 +145,8 @@ void CompInfo::init_lbs_sat_solver()
141145
for (size_t i=0; i < Fun_coi_lits.size(); i++) {
142146
int lit = Fun_coi_lits[i];
143147
int var_ind = abs(lit)-1;
144-
assert (Var_info[var_ind].type == INTERN);
148+
INVARIANT(
149+
Var_info[var_ind].type == INTERN, "Type of literal should be INTERN");
145150
U.push_back(-lit);
146151
}
147152

‎src/ic3/m0ic3.hh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Module: IC3 types
55
Author: Eugene Goldberg, [email protected]
66
77
******************************************************/
8+
89
#include "aux_types.hh"
910

1011
extern int debug_flag;

‎src/ic3/m1ain.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ int CompInfo::run_ic3()
195195

196196

197197
bool ok = check_init_states();
198-
assert(ok);
198+
INVARIANT(ok, "Initial states should be defined via single literal.");
199199
assign_var_type();
200200
assign_value();
201201
get_runtime (usrtime0, systime0);
@@ -242,7 +242,7 @@ int CompInfo::run_ic3()
242242
print_fclauses();
243243
break;
244244
default:
245-
assert(false);
245+
UNREACHABLE;
246246
}
247247
if (statistics) {
248248
printf("*********\n");

‎src/ic3/my_printf.cc

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ Module: Structuring the output of large numbers by
66
Author: Eugene Goldberg, [email protected]
77
88
******************************************************/
9+
#include <util/invariant.h>
10+
11+
#include "dnf_io.hh"
12+
13+
#include <algorithm>
914
#include <assert.h>
15+
#include <iostream>
16+
#include <map>
17+
#include <queue>
18+
#include <set>
1019
#include <stdarg.h>
1120
#include <stdio.h>
12-
#include <set>
13-
#include <algorithm>
14-
#include <queue>
15-
#include <map>
16-
#include <iostream>
17-
#include "dnf_io.hh"
1821
const int factor = 1000;
1922

2023
/*================================================
@@ -65,7 +68,7 @@ void my_printf(const char *format,...)
6568
int c = *format++;
6669
if (c != '%') {printf("%c",c); continue;}
6770
int spec = *format++;
68-
assert(spec == 'm');
71+
INVARIANT(spec == 'm', "Character should be 'm' in format string.");
6972
int num = va_arg(ap,int);
7073
print_num_with_commas(num);
7174
// printf("%d",num);

‎src/ic3/p5ick_lit.cc

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@ Module: Picking a literal to remove when generalizing
66
Author: Eugene Goldberg, [email protected]
77
88
******************************************************/
9-
#include <queue>
10-
#include <set>
11-
#include <map>
9+
#include <util/invariant.h>
10+
11+
#include "ccircuit.hh"
12+
#include "dnf_io.hh"
13+
#include "m0ic3.hh"
14+
1215
#include <algorithm>
1316
#include <iostream>
17+
#include <map>
18+
#include <queue>
19+
#include <set>
20+
1421
#include "minisat/core/Solver.h"
1522
#include "minisat/simp/SimpSolver.h"
16-
#include "dnf_io.hh"
17-
#include "ccircuit.hh"
18-
#include "m0ic3.hh"
19-
2023

2124
/*=============================
2225
@@ -52,6 +55,5 @@ int CompInfo::fxd_ord_lit(CUBE &Curr,SCUBE &Tried)
5255
return(lit);
5356
}
5457

55-
assert(false); // shouldn't reach this line
56-
58+
UNREACHABLE;
5759
} /* end of function fxd_ord_lit */

‎src/ic3/r0ead_input.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ void ic3_enginet::form_inputs()
128128
CCUBE Name;
129129
if (orig_names) {
130130
bool ok = form_orig_name(Name,lit);
131-
assert(ok);}
131+
INVARIANT(ok, "Literal should have an original name.");
132+
}
132133
else {
133134
char Inp_name[MAX_NAME];
134135
sprintf(Inp_name,"i%d",lit_val);

‎src/ic3/r4ead_input.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void ic3_enginet::form_latch_name(CCUBE &Latch_name,literalt &lit)
107107
{
108108
if (orig_names) {
109109
bool ok = form_orig_name(Latch_name,lit);
110-
assert(ok);
110+
INVARIANT(ok, "Literal should have original name.");
111111
return; }
112112

113113
char Buff[MAX_NAME];

‎src/ic3/s2horten_clause.cc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ Module: Generalization of an inductive clause
55
Author: Eugene Goldberg, [email protected]
66
77
******************************************************/
8-
#include <queue>
9-
#include <set>
10-
#include <map>
8+
#include <util/invariant.h>
9+
10+
#include "ccircuit.hh"
11+
#include "dnf_io.hh"
12+
#include "m0ic3.hh"
13+
1114
#include <algorithm>
1215
#include <iostream>
16+
#include <map>
17+
#include <queue>
18+
#include <set>
19+
1320
#include "minisat/core/Solver.h"
1421
#include "minisat/simp/SimpSolver.h"
15-
#include "dnf_io.hh"
16-
#include "ccircuit.hh"
17-
#include "m0ic3.hh"
1822

1923
/*==================================
2024
@@ -86,8 +90,8 @@ void CompInfo::find_fixed_pnt(CLAUSE &C,CLAUSE &C0,SatSolver &Slvr,
8690
// run a SAT-check
8791

8892
bool sat_form = check_sat2(Slvr,Assmps);
89-
90-
assert(sat_form == false);
93+
94+
INVARIANT(sat_form == false, "SAT check should fail here.");
9195
CLAUSE B;
9296
gen_assump_clause(B,Slvr,Assmps);
9397
CLAUSE B1;

‎src/ic3/seq_circ/a4dd_spec_buffs.cc

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ Module: Treating the case when a gate feeds more
66
Author: Eugene Goldberg, [email protected]
77
88
******************************************************/
9+
#include <util/invariant.h>
10+
11+
#include "ccircuit.hh"
12+
#include "dnf_io.hh"
13+
14+
#include <algorithm>
15+
#include <assert.h>
916
#include <iostream>
10-
#include <vector>
11-
#include <set>
1217
#include <map>
13-
#include <algorithm>
1418
#include <queue>
15-
#include <assert.h>
16-
#include <string.h>
19+
#include <set>
1720
#include <stdio.h>
18-
#include "dnf_io.hh"
19-
#include "ccircuit.hh"
20-
21+
#include <string.h>
22+
#include <vector>
2123

2224
/*=========================================
2325
@@ -121,7 +123,9 @@ int spec_buff_gate_ind(Circuit *N,int ind)
121123
int gate_ind = N->Pin_list[fake_name];
122124

123125
Gate &G = N->get_gate(gate_ind);
124-
assert(G.spec_buff_ind == ind);
126+
INVARIANT(
127+
G.spec_buff_ind == ind,
128+
"Special buffer index of gate should be equal to value of `ind`");
125129

126130
return(gate_ind);
127131

‎src/ic3/seq_circ/ccircuit.hh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Module: Basic types (gate, circuit and so on)
66
Author: Eugene Goldberg, [email protected]
77
88
******************************************************/
9+
10+
#include "dnf_io.hh"
11+
912
struct ConstrGateInfo {
1013
unsigned neg_lit:1;
1114
unsigned fun_coi:1;

0 commit comments

Comments
 (0)