refactor: Use clang's nullability qualifiers instead of attributes.

Author: iphydf

.circleci/config.yml

@@ -125,15 +125,12 @@ jobs:
   cimple:
     working_directory: /tmp/cirrus-ci-build
     docker:
-      - image: toxchat/toktok-stack:latest-release
+      - image: toxchat/toktok-stack:latest
 
     steps:
       - checkout
-      - run: git submodule update --init --recursive
-      - run: /src/workspace/tools/inject-repo c-toxcore
-      - run: cd /src/workspace &&
-          bazel test
-            -k
+      - run:
+          CIRCLE_JOB=release bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
             --build_tag_filters=haskell
             --test_tag_filters=haskell
             --

.github/scripts/flags-clang.sh

@@ -9,6 +9,11 @@ add_flag -Weverything
 
 # Disable specific warning flags for both C and C++.
 
+# We're not checking nullability, yet.
+# TODO(iphydf): Remove.
+add_flag -Wno-nullable-to-nonnull-conversion
+add_flag -Wno-nullability-completeness
+
 # Very verbose, not very useful. This warns about things like int -> uint
 # conversions that change sign without a cast and narrowing conversions.
 add_flag -Wno-conversion
@@ -30,6 +35,8 @@ add_flag -Wno-missing-braces
 add_flag -Wno-missing-field-initializers
 # We don't use this attribute. It appears in the non-NDEBUG stderr logger.
 add_flag -Wno-missing-noreturn
+# We want to use this extension.
+add_flag -Wno-nullability-extension
 # Useful sometimes, but we accept padding in structs for clarity.
 # Reordering fields to avoid padding will reduce readability.
 add_flag -Wno-padded

other/analysis/run-clang

@@ -25,15 +25,18 @@ run() {
     -Wno-missing-braces \
     -Wno-missing-field-initializers \
     -Wno-missing-noreturn \
+    -Wno-nullability-completeness \
+    -Wno-nullability-extension \
+    -Wno-nullable-to-nonnull-conversion \
     -Wno-old-style-cast \
     -Wno-padded \
+    -Wno-source-uses-openmp \
     -Wno-switch-default \
     -Wno-tautological-pointer-compare \
     -Wno-unreachable-code-return \
     -Wno-unsafe-buffer-usage \
     -Wno-unused-parameter \
-    -Wno-used-but-marked-unused \
-    -Wno-source-uses-openmp
+    -Wno-used-but-marked-unused
 }
 
 . other/analysis/variants.sh

other/analysis/run-clang-tidy

@@ -7,6 +7,11 @@ ERRORS="*"
 # Still good to occasionally look at.
 ERRORS="$ERRORS,-google-readability-casting"
 
+# TODO(iphydf): Fix these.
+CHECKS="$CHECKS,-clang-analyzer-nullability.NullableDereferenced"
+CHECKS="$CHECKS,-clang-analyzer-nullability.NullablePassedToNonnull"
+CHECKS="$CHECKS,-clang-analyzer-nullability.NullPassedToNonnull"
+
 # Need to investigate or disable and document these.
 # =========================================================
 

other/event_tooling/generate_event_c.cpp

@@ -228,14 +228,14 @@ void generate_event_impl(const std::string& event_name, const std::vector<EventT
             },
             t
         );
-        f << "(non_null() Tox_Event_" << event_name << " *" << event_name_l << ",";
+        f << "(Tox_Event_" << event_name << " *_Nonnull " << event_name_l << ",";
         std::visit(
             overloaded{
                 [&](const EventTypeTrivial& t) {
                     f << " " << t.type << " " << t.name << ")\n";
                 },
                 [&](const EventTypeByteRange& t) {
-                    f << "\n        nullable() const uint8_t *" << t.name_data << ", uint32_t " << t.name_length << ")\n";
+                    f << "\n        const uint8_t *_Nullable " << t.name_data << ", uint32_t " << t.name_length << ")\n";
                 }
             },
             t
@@ -296,14 +296,14 @@ void generate_event_impl(const std::string& event_name, const std::vector<EventT
 
 
     // gen contruct
-    f << "static void tox_event_" << event_name_l << "_construct(non_null() Tox_Event_" << event_name << " *" << event_name_l << ")\n{\n";
+    f << "static void tox_event_" << event_name_l << "_construct(Tox_Event_" << event_name << " *_Nonnull " << event_name_l << ")\n{\n";
     // TODO: initialize all members properly
     // TODO: check if _NONE is universal
     // str_toupper(
     f << "    *" << event_name_l << " = (Tox_Event_" << event_name << ") {\n        0\n    };\n}\n";
 
     // gen destruct
-    f << "static void tox_event_" << event_name_l << "_destruct(non_null() Tox_Event_" << event_name << " *" << event_name_l << ", non_null() const Memory *mem)\n{\n";
+    f << "static void tox_event_" << event_name_l << "_destruct(Tox_Event_" << event_name << " *_Nonnull " << event_name_l << ", const Memory *_Nonnull mem)\n{\n";
     size_t data_count = 0;
     for (const auto& t : event_types) {
         std::visit(
@@ -361,7 +361,7 @@ void generate_event_impl(const std::string& event_name, const std::vector<EventT
     f << ";\n}\n\n";
 
     // unpack
-    f << "static bool tox_event_" << event_name_l << "_unpack_into(non_null() Tox_Event_" << event_name << " *event, non_null() Bin_Unpack *bu)\n{\n";
+    f << "static bool tox_event_" << event_name_l << "_unpack_into(Tox_Event_" << event_name << " *_Nonnull event, Bin_Unpack *_Nonnull bu)\n{\n";
     f << "    assert(event != nullptr);\n";
     if (event_types.size() > 1) {
         f << "    if (!bin_unpack_array_fixed(bu, " << event_types.size() << ", nullptr)) {\n        return false;\n    }\n\n";
@@ -421,7 +421,7 @@ void generate_event_impl(const std::string& event_name, const std::vector<EventT
     f << "    mem_delete(mem, " << event_name_l << ");\n}\n\n";
 
     // add
-    f << "static Tox_Event_" << event_name << " *tox_events_add_" << event_name_l << "(non_null() Tox_Events *events, non_null() const Memory *mem)\n{\n";
+    f << "static Tox_Event_" << event_name << " *tox_events_add_" << event_name_l << "(Tox_Events *_Nonnull events, const Memory *_Nonnull mem)\n{\n";
     f << "    Tox_Event_" << event_name << " *const " << event_name_l << " = tox_event_" << event_name_l << "_new(mem);\n\n";
     f << "    if (" << event_name_l << " == nullptr) {\n";
     f << "        return nullptr;\n    }\n\n";
@@ -444,7 +444,7 @@ void generate_event_impl(const std::string& event_name, const std::vector<EventT
     f << "    return tox_event_" << event_name_l << "_unpack_into(*event, bu);\n}\n\n";
 
     // alloc
-    f << "static Tox_Event_" << event_name << " *tox_event_" << event_name_l << "_alloc(non_null() void *user_data)\n{\n";
+    f << "static Tox_Event_" << event_name << " *tox_event_" << event_name_l << "_alloc(void *_Nonnull user_data)\n{\n";
     f << "    Tox_Events_State *state = tox_events_alloc(user_data);\n";
     f << "    assert(state != nullptr);\n\n";
     f << "    if (state->events == nullptr) {\n        return nullptr;\n    }\n\n";

toxav/toxav_hacks.h

@@ -14,16 +14,16 @@
 typedef struct ToxAVCall ToxAVCall;
 #endif /* TOXAV_CALL_DEFINED */
 
-ToxAVCall *call_get(non_null() ToxAV *av, uint32_t friend_number);
+ToxAVCall *_Nullable call_get(ToxAV *_Nonnull av, uint32_t friend_number);
 
-RTPSession *rtp_session_get(non_null() ToxAVCall *call, int payload_type);
+RTPSession *_Nullable rtp_session_get(ToxAVCall *_Nonnull call, int payload_type);
 
-MSISession *tox_av_msi_get(non_null() const ToxAV *av);
+MSISession *_Nullable tox_av_msi_get(const ToxAV *_Nonnull av);
 
-BWController *bwc_controller_get(non_null() const ToxAVCall *call);
+BWController *_Nullable bwc_controller_get(const ToxAVCall *_Nonnull call);
 
-Mono_Time *toxav_get_av_mono_time(non_null() const ToxAV *av);
+Mono_Time *_Nullable toxav_get_av_mono_time(const ToxAV *_Nonnull av);
 
-const Logger *toxav_get_logger(non_null() const ToxAV *av);
+const Logger *_Nonnull toxav_get_logger(const ToxAV *_Nonnull av);
 
 #endif /* C_TOXCORE_TOXAV_HACKS_H */