[Tolk] Simplify VarDescr, drop _Const enum value

Now, only VarDescr::int_const represents whether it's a constant,
without being combined (and potentially become unsync) val bit.

Author: tolk-vm

tolk-tester/tests/logical-operators.tolk

@@ -148,6 +148,31 @@ fun testConvertIfToIfnot(x: bool) {
     return -4;
 }
 
+@pure
+fun get123(): int
+    asm "123 PUSHINT";
+
+@method_id(114)
+fun test114() {
+    val fals = (get123() < 0) as int;
+    return (fals ? -1 : fals) != 0;
+}
+
+@method_id(115)
+fun test115() {
+    val tru = get123() >= 0;
+    val fals = get123() < 0;
+
+    if ((true || false) && (false || false)) {
+        throw 123;
+    }
+    if ((tru || fals) && (fals || fals)) {
+        throw 456;
+    }
+    return (tru, fals);
+}
+
+
 fun main() {
 
 }
@@ -187,6 +212,8 @@ fun main() {
 @testcase | 112 | 5 0    | 0 -1 0 -1 -1
 @testcase | 112 | 0 -1   | -1 -1 -1 -1 -1
 @testcase | 113 | 0      | 1
+@testcase | 114 |        | 0
+@testcase | 115 |        | -1 0
 
 @fif_codegen
 """

tolk-tester/tests/smart-cast-tests.tolk

@@ -148,9 +148,10 @@ fun test10(): int {
     return x + y;
 }
 
+@method_id(111)
 fun test11() {
     var [x, y] = [getNullableInt(), getNullableInt()];
-    if (random()) { return x == null || y == null ? -1 : x + y; }
+    if (eq(10) < 0) { return x == null || y == null ? -1 : x + y; }
     if (true && (x == null || y == null) && !!true) { return 0; }
     return x + y;
 }
@@ -665,6 +666,7 @@ fun main(x: int?): int {
 
 /**
 @testcase | 0   | 1     | 1
+@testcase | 111 |       | 10
 @testcase | 123 |       | 7
 @testcase | 124 | 4     | 6
 @testcase | 124 | null  | 15

tolk/abscode.cpp

@@ -59,9 +59,6 @@ void VarDescr::show_value(std::ostream& os) const {
   if (val & _Int) {
     os << 'i';
   }
-  if (val & _Const) {
-    os << 'c';
-  }
   if (val & _Zero) {
     os << '0';
   }
@@ -114,7 +111,7 @@ void VarDescr::set_const(td::RefInt256 value) {
   if (!int_const->signed_fits_bits(257)) {
     int_const.write().invalidate();
   }
-  val = _Const | _Int;
+  val = _Int;
   int s = sgn(int_const);
   if (s < -1) {
     val |= _Nan | _NonZero;
@@ -130,41 +127,41 @@ void VarDescr::set_const(td::RefInt256 value) {
   }
 }
 
-void VarDescr::set_const(std::string value) {
-  str_const = value;
-  val = _Const;
+void VarDescr::set_const(const std::string&) {
+  int_const.clear();
+  val = 0;
 }
 
 void VarDescr::operator|=(const VarDescr& y) {
-  val &= y.val;
-  if (is_int_const() && y.is_int_const() && cmp(int_const, y.int_const) != 0) {
-    val &= ~_Const;
-  }
-  if (!(val & _Const)) {
-    int_const.clear();
+  if (is_int_const()) {
+    bool y_same = y.is_int_const() && *int_const == *y.int_const;
+    if (!y_same) {
+      int_const.clear();
+    }
   }
+  val &= y.val;
 }
 
 void VarDescr::operator&=(const VarDescr& y) {
-  val |= y.val;
-  if (y.int_const.not_null() && int_const.is_null()) {
+  if (y.is_int_const()) {
     int_const = y.int_const;
   }
+  val |= y.val;
 }
 
 void VarDescr::set_value(const VarDescr& y) {
-  val = y.val;
   int_const = y.int_const;
+  val = y.val;
 }
 
 void VarDescr::set_value(VarDescr&& y) {
-  val = y.val;
   int_const = std::move(y.int_const);
+  val = y.val;
 }
 
 void VarDescr::clear_value() {
-  val = 0;
   int_const.clear();
+  val = 0;
 }
 
 void VarDescrList::show(std::ostream& os) const {

tolk/analyzer.cpp

@@ -62,10 +62,10 @@ bool operator==(const VarDescrList& x, const VarDescrList& y) {
 }
 
 bool same_values(const VarDescr& x, const VarDescr& y) {
-  if (x.val != y.val || x.int_const.is_null() != y.int_const.is_null()) {
+  if (x.val != y.val || x.is_int_const() != y.is_int_const()) {
     return false;
   }
-  if (x.int_const.not_null() && cmp(x.int_const, y.int_const) != 0) {
+  if (x.is_int_const() && *x.int_const != *y.int_const) {
     return false;
   }
   return true;

tolk/tolk.h

@@ -68,7 +68,6 @@ struct VarDescr {
   enum { _Last = 1, _Unused = 2 };
   int flags;
   enum {
-    _Const = 16,
     _Int = 32,
     _Zero = 64,
     _NonZero = 128,
@@ -79,16 +78,15 @@ struct VarDescr {
     _Even = 16384,
     _Odd = 32768,
   };
-  static constexpr int ConstZero  = _Const | _Int | _Zero | _Pos | _Neg | _Finite | _Even;
-  static constexpr int ConstOne   = _Const | _Int | _NonZero | _Pos | _Finite | _Odd;
-  static constexpr int ConstTrue  = _Const | _Int | _NonZero | _Neg | _Finite | _Odd;
+  static constexpr int ConstZero  = _Int | _Zero | _Pos | _Neg | _Finite | _Even;
+  static constexpr int ConstOne   = _Int | _NonZero | _Pos | _Finite | _Odd;
+  static constexpr int ConstTrue  = _Int | _NonZero | _Neg | _Finite | _Odd;
   static constexpr int ValBit     = _Int | _Pos | _Finite;
   static constexpr int ValBool    = _Int | _Neg | _Finite;
   static constexpr int FiniteInt  = _Int | _Finite;
   static constexpr int FiniteUInt = _Int | _Finite | _Pos;
   int val;
   td::RefInt256 int_const;
-  std::string str_const;
 
   explicit VarDescr(var_idx_t _idx = -1, int _flags = 0, int _val = 0) : idx(_idx), flags(_flags), val(_val) {
   }
@@ -120,7 +118,12 @@ struct VarDescr {
     return val & _Odd;
   }
   bool is_int_const() const {
-    return (val & (_Int | _Const)) == (_Int | _Const) && int_const.not_null();
+#ifdef TOLK_DEBUG
+    if (int_const.not_null()) {
+      tolk_assert(val & _Int);
+    }
+#endif
+    return int_const.not_null();
   }
   bool always_nonpos() const {
     return val & _Neg;
@@ -151,7 +154,7 @@ struct VarDescr {
   }
   void set_const(long long value);
   void set_const(td::RefInt256 value);
-  void set_const(std::string value);
+  void set_const(const std::string& value);
   void operator+=(const VarDescr& y) {
     flags &= y.flags;
   }