Skip to content

Commit 93b2371

Browse files
committed
Disable a number of invariants that currently fail
This takes us back to the behaviour prior to this series of commits, and effectively is a to-do list to be addressed. We should either handle the cases, or get rid of the instruction type.
1 parent d28968c commit 93b2371

5 files changed

+18
-0
lines changed

src/analyses/escape_analysis.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ void escape_domaint::transform(
272272
case SKIP: // No action required
273273
break;
274274
case OTHER:
275+
#if 0
275276
DATA_INVARIANT(false, "Unclear what is a safe over-approximation of OTHER");
277+
#endif
276278
break;
277279
case INCOMPLETE_GOTO:
278280
case NO_INSTRUCTION_TYPE:

src/analyses/interval_domain.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ void interval_domaint::transform(
125125
case SKIP: // No action required
126126
break;
127127
case OTHER:
128+
#if 0
128129
DATA_INVARIANT(false, "Unclear what is a safe over-approximation of OTHER");
130+
#endif
129131
break;
130132
case INCOMPLETE_GOTO:
131133
case NO_INSTRUCTION_TYPE:

src/analyses/local_bitvector_analysis.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,15 @@ void local_bitvector_analysist::build()
310310

311311
case CATCH:
312312
case THROW:
313+
#if 0
313314
DATA_INVARIANT(false, "Exceptions must be removed before analysis");
314315
break;
316+
#endif
315317
case RETURN:
318+
#if 0
316319
DATA_INVARIANT(false, "Returns must be removed before analysis");
317320
break;
321+
#endif
318322
case ATOMIC_BEGIN: // Ignoring is a valid over-approximation
319323
case ATOMIC_END: // Ignoring is a valid over-approximation
320324
case LOCATION: // No action required
@@ -327,8 +331,10 @@ void local_bitvector_analysist::build()
327331
case END_FUNCTION: // No action required
328332
break;
329333
case OTHER:
334+
#if 0
330335
DATA_INVARIANT(
331336
false, "Unclear what is a safe over-approximation of OTHER");
337+
#endif
332338
break;
333339
case INCOMPLETE_GOTO:
334340
case NO_INSTRUCTION_TYPE:

src/analyses/local_may_alias.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,9 @@ void local_may_aliast::build(const goto_functiont &goto_function)
422422
DATA_INVARIANT(false, "Exceptions must be removed before analysis");
423423
break;
424424
case RETURN:
425+
#if 0
425426
DATA_INVARIANT(false, "Returns must be removed before analysis");
427+
#endif
426428
break;
427429
case GOTO: // Ignoring the guard is a valid over-approximation
428430
case START_THREAD: // Require a concurrent analysis at higher level
@@ -436,8 +438,10 @@ void local_may_aliast::build(const goto_functiont &goto_function)
436438
case ASSUME: // Ignoring is a valid over-approximation
437439
break;
438440
case OTHER:
441+
#if 0
439442
DATA_INVARIANT(
440443
false, "Unclear what is a safe over-approximation of OTHER");
444+
#endif
441445
break;
442446
case INCOMPLETE_GOTO:
443447
case NO_INSTRUCTION_TYPE:

src/analyses/uncaught_exceptions_analysis.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ void uncaught_exceptions_domaint::transform(
130130
case ASSIGN: // Safe to ignore in this context
131131
break;
132132
case RETURN:
133+
#if 0
133134
DATA_INVARIANT(false, "Returns must be removed before analysis");
135+
#endif
134136
break;
135137
case GOTO: // Ignoring the guard is a valid over-approximation
136138
case ATOMIC_BEGIN: // Ignoring is a valid over-approximation
@@ -144,7 +146,9 @@ void uncaught_exceptions_domaint::transform(
144146
case SKIP: // No action required
145147
break;
146148
case OTHER:
149+
#if 0
147150
DATA_INVARIANT(false, "Unclear what is a safe over-approximation of OTHER");
151+
#endif
148152
break;
149153
case INCOMPLETE_GOTO:
150154
case NO_INSTRUCTION_TYPE:

0 commit comments

Comments
 (0)