Fix -bugprone-sizeof-expression

.clang-tidy

@@ -13,7 +13,6 @@ Checks:
   -bugprone-easily-swappable-parameters
   -bugprone-narrowing-conversions
   -bugprone-exception-escape
-  -bugprone-sizeof-expression
   -bugprone-implicit-widening-of-multiplication-result
   -bugprone-unchecked-optional-access # false positives
 

runtime/io/io.cpp

@@ -617,6 +617,7 @@ list hook_KREFLECTION_argv() {
 
   list l{};
 
+  // NOLINTBEGIN(*-sizeof-expression)
   for (int i = 0; i < llvm_backend_argc; i++) {
     stringbuffer *buf = hook_BUFFER_empty();
     buf = hook_BUFFER_concat_raw(
@@ -628,6 +629,7 @@ list hook_KREFLECTION_argv() {
     memcpy(b->children, &str, sizeof(str));
     l = l.push_back(KElem(b));
   }
+  // NOLINTEND(*-sizeof-expression)
 
   return l;
 }

runtime/strings/strings.cpp

@@ -17,8 +17,6 @@
 
 extern "C" {
 
-#define KCHAR char
-
 mpz_ptr move_int(mpz_t);
 floating *move_float(floating *);
 
@@ -85,9 +83,9 @@ SortString hook_STRING_chr(SortInt ord) {
     KLLVM_HOOK_INVALID_ARGUMENT("Ord must be <= 255: {}", uord);
   }
   auto ret
-      = static_cast<string *>(koreAllocToken(sizeof(string) + sizeof(KCHAR)));
+      = static_cast<string *>(koreAllocToken(sizeof(string) + sizeof(char)));
   init_with_len(ret, 1);
-  ret->data[0] = static_cast<KCHAR>(uord);
+  ret->data[0] = static_cast<char>(uord);
   return ret;
 }
 
@@ -113,10 +111,9 @@ SortInt hook_STRING_find(SortString haystack, SortString needle, SortInt pos) {
     return move_int(result);
   }
   auto out = std::search(
-      haystack->data + upos * sizeof(KCHAR),
-      haystack->data + len(haystack) * sizeof(KCHAR), needle->data,
-      needle->data + len(needle) * sizeof(KCHAR));
-  int64_t ret = (out - haystack->data) / sizeof(KCHAR);
+      haystack->data + upos, haystack->data + len(haystack), needle->data,
+      needle->data + len(needle));
+  int64_t ret = out - haystack->data;
   // search returns the end of the range if it is not found, but we want -1 in
   // such a case.
   auto res = (ret < len(haystack)) ? ret : -1;
@@ -150,10 +147,9 @@ hook_STRING_findChar(SortString haystack, SortString needle, SortInt pos) {
     return move_int(result);
   }
   auto out = std::find_first_of(
-      haystack->data + upos * sizeof(KCHAR),
-      haystack->data + len(haystack) * sizeof(KCHAR), needle->data,
-      needle->data + len(needle) * sizeof(KCHAR));
-  int64_t ret = (out - haystack->data) / sizeof(KCHAR);
+      haystack->data + upos, haystack->data + len(haystack), needle->data,
+      needle->data + len(needle));
+  int64_t ret = out - haystack->data;
   // search returns the end of the range if it is not found, but we want -1 in
   // such a case.
   auto res = (ret < len(haystack)) ? ret : -1;
@@ -180,7 +176,7 @@ hook_STRING_rfindChar(SortString haystack, SortString needle, SortInt pos) {
   return move_int(result);
 }
 
-string *makeString(const KCHAR *input, ssize_t len = -1) {
+string *makeString(const char *input, ssize_t len = -1) {
   if (len == -1) {
     len = strlen(input);
   }
@@ -308,8 +304,7 @@ inline SortString hook_STRING_replace(
   }
   auto diff = len(needle) - len(replacer);
   size_t new_len = len(haystack) - i * diff;
-  auto ret = static_cast<string *>(
-      koreAllocToken(sizeof(string) + new_len * sizeof(KCHAR)));
+  auto ret = static_cast<string *>(koreAllocToken(sizeof(string) + new_len));
   init_with_len(ret, new_len);
   int m = 0;
   for (size_t r = 0, h = 0; r < new_len;) {