Skip to content

Commit 1b46a0e

Browse files
committed
unpack_array_vector: Replace now-unnecessary if/else by ?:
We only need to set a single variable after the preceding fix, and can thus get away without an optionalt.
1 parent ddc5539 commit 1b46a0e

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

src/solvers/lowering/byte_operators.cpp

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -475,24 +475,17 @@ static exprt unpack_array_vector(
475475
body};
476476
}
477477

478-
optionalt<exprt> array_vector_size;
479-
if(src.type().id() == ID_vector)
480-
{
481-
array_vector_size = to_vector_type(src.type()).size();
482-
}
483-
else
484-
{
485-
array_vector_size = to_array_type(src.type()).size();
486-
}
487-
478+
const exprt array_vector_size = src.type().id() == ID_vector
479+
? to_vector_type(src.type()).size()
480+
: to_array_type(src.type()).size();
488481

489482
return array_comprehension_exprt{
490483
std::move(array_comprehension_index),
491484
std::move(body),
492485
array_typet{
493486
bv_typet{8},
494-
mult_exprt{*array_vector_size,
495-
from_integer(el_bytes, array_vector_size->type())}}};
487+
mult_exprt{array_vector_size,
488+
from_integer(el_bytes, array_vector_size.type())}}};
496489
}
497490

498491
exprt::operandst byte_operands;

0 commit comments

Comments
 (0)