Merge remote-tracking branch 'origin/topic/robin/remove-std-function'

* origin/topic/robin/remove-std-function: Address review feedback. Remove unused include headers. Remove all usage of `std::function` from toolchain. Remove usage of `std::function` from parser and sink runtime representations. Remove use of `std::function` from `spicy::rt::Configuration`. Remove unused functional header. Remove use of `std::function` from runtime vector class. Remove support for deferred expressions.
zeek · May 10, 2024 · e2b5c11 · e2b5c11
2 parents 92f7654 + 359e2ae
commit e2b5c11
Show file tree

Hide file tree

Showing 67 changed files with 208 additions and 461 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,26 @@
+1.11.0-dev.151 | 2024-05-10 16:35:50 +0200
+
+  * Remove unused include headers. (Robin Sommer, Corelight)
+
+  * Remove all usage of `std::function` from toolchain. (Robin Sommer, Corelight)
+
+  * Remove usage of `std::function` from parser and sink runtime representations. (Robin Sommer, Corelight)
+
+    We switch to raw function pointers, which is easy enough.
+
+  * Remove use of `std::function` from `spicy::rt::Configuration`. (Robin Sommer, Corelight)
+
+    Callbacks are now classic function pointers.
+
+  * Remove unused functional header. (Robin Sommer, Corelight)
+
+  * Remove use of `std::function` from runtime vector class. (Robin Sommer, Corelight)
+
+  * Remove support for deferred expressions. (Robin Sommer, Corelight)
+
+    These weren't used anymore anywhere so we can remove the corresponding
+    code from toolchain and runtime.
+
 1.11.0-dev.142 | 2024-05-06 15:14:40 +0200
 
   * GH-1664: Fix `&convert` typing issue with bit ranges. (Robin Sommer, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.11.0-dev.142
+1.11.0-dev.151
diff --git a/hilti/runtime/CMakeLists.txt b/hilti/runtime/CMakeLists.txt
@@ -139,7 +139,6 @@ add_executable(
     src/tests/bytes.cc
     src/tests/context.cc
     src/tests/debug-logger.cc
-    src/tests/deferred-expression.cc
     src/tests/enum.cc
     src/tests/exception.cc
     src/tests/fiber.cc

diff --git a/hilti/runtime/include/configuration.h b/hilti/runtime/include/configuration.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <cstddef>
-#include <iostream>
 #include <memory>
 #include <optional>
 #include <string>

diff --git a/hilti/runtime/include/context.h b/hilti/runtime/include/context.h
@@ -3,9 +3,7 @@
 #pragma once
 
 #include <cassert>
-#include <iostream>
 #include <memory>
-#include <optional>
 #include <utility>
 #include <vector>
 

diff --git a/hilti/runtime/include/debug-logger.h b/hilti/runtime/include/debug-logger.h
@@ -5,7 +5,6 @@
 #include <fstream>
 #include <map>
 #include <memory>
-#include <optional>
 #include <string_view>
 
 #include <hilti/rt/filesystem.h>

diff --git a/hilti/runtime/include/deferred-expression.h b/hilti/runtime/include/deferred-expression.h
diff --git a/hilti/runtime/include/exception.h b/hilti/runtime/include/exception.h
@@ -2,14 +2,12 @@
 
 #pragma once
 
-#include <iostream>
 #include <optional>
 #include <ostream>
 #include <stdexcept>
 #include <string>
 #include <string_view>
 #include <utility>
-#include <vector>
 
 #include <hilti/rt/backtrace.h>
 #include <hilti/rt/extension-points.h>

diff --git a/hilti/runtime/include/fiber.h b/hilti/runtime/include/fiber.h
@@ -3,8 +3,6 @@
 #pragma once
 
 #include <csetjmp>
-#include <functional>
-#include <iostream>
 #include <memory>
 #include <optional>
 #include <string>

diff --git a/hilti/runtime/include/global-state.h b/hilti/runtime/include/global-state.h
@@ -4,7 +4,6 @@
 #include <sys/resource.h>
 
 #include <memory>
-#include <optional>
 #include <string>
 #include <unordered_map>
 #include <vector>

diff --git a/hilti/runtime/include/hilti.h b/hilti/runtime/include/hilti.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <iostream>
 #include <type_traits>
 
 #include <hilti/rt/configuration.h>

diff --git a/hilti/runtime/include/intrusive-ptr.h b/hilti/runtime/include/intrusive-ptr.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <cstdint>
-#include <iostream>
 #include <type_traits>
 #include <utility>
 

diff --git a/hilti/runtime/include/libhilti.h b/hilti/runtime/include/libhilti.h
@@ -10,7 +10,6 @@
 #include <hilti/rt/autogen/version.h>
 #include <hilti/rt/configuration.h>
 #include <hilti/rt/context.h>
-#include <hilti/rt/deferred-expression.h>
 #include <hilti/rt/exception.h>
 #include <hilti/rt/extension-points.h>
 #include <hilti/rt/fiber-check-stack.h>

diff --git a/hilti/runtime/include/types/enum.h b/hilti/runtime/include/types/enum.h
@@ -4,9 +4,7 @@
 
 #include <algorithm>
 #include <limits>
-#include <string>
 #include <type_traits>
-#include <variant>
 
 #include <hilti/rt/exception.h>
 #include <hilti/rt/logging.h>

diff --git a/hilti/runtime/include/types/function.h b/hilti/runtime/include/types/function.h
@@ -8,11 +8,6 @@
 
 namespace hilti::rt::detail::adl {
 
-template<typename R, typename... Args>
-inline std::string to_string(std::function<R(Args...)>, adl::tag /*unused*/) {
-    return "<function>";
-}
-
 template<typename R, typename... Args>
 inline std::string to_string(R (*)(Args...), adl::tag /*unused*/) {
     return "<function>";

diff --git a/hilti/runtime/include/types/interval.h b/hilti/runtime/include/types/interval.h
@@ -5,9 +5,7 @@
 #include <arpa/inet.h>
 
 #include <limits>
-#include <memory>
 #include <string>
-#include <variant>
 
 #include <hilti/rt/extension-points.h>
 #include <hilti/rt/fmt.h>

diff --git a/hilti/runtime/include/types/map.h b/hilti/runtime/include/types/map.h
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <algorithm>
-#include <functional>
 #include <initializer_list>
 #include <map>
 #include <memory>

diff --git a/hilti/runtime/include/types/network.h b/hilti/runtime/include/types/network.h
@@ -5,7 +5,6 @@
 #include <arpa/inet.h>
 
 #include <string>
-#include <variant>
 
 #include <hilti/rt/exception.h>
 #include <hilti/rt/extension-points.h>

diff --git a/hilti/runtime/include/types/null.h b/hilti/runtime/include/types/null.h
@@ -7,7 +7,6 @@
 #include <optional>
 #include <ostream>
 #include <string>
-#include <variant>
 
 #include <hilti/rt/extension-points.h>
 

diff --git a/hilti/runtime/include/types/port.h b/hilti/runtime/include/types/port.h
@@ -5,7 +5,6 @@
 #include <arpa/inet.h>
 
 #include <string>
-#include <variant>
 
 #include <hilti/rt/extension-points.h>
 #include <hilti/rt/types/address.h>

diff --git a/hilti/runtime/include/types/reference.h b/hilti/runtime/include/types/reference.h
@@ -716,6 +716,23 @@ class StrongReferenceGeneric {
         }
     }
 
+    /**
+     * Returns a value reference that is linked to the referred value. If the
+     * strong reference is null or expired, the returned reference will be
+     * null.
+     */
+    template<typename T>
+    ValueReference<T> derefAsValue() const {
+        if ( _ptr.empty() )
+            return {};
+
+        try {
+            return hilti::rt::any_cast<StrongReference<T>>(_ptr).derefAsValue();
+        } catch ( const hilti::rt::bad_any_cast& ) {
+            throw IllegalReference("invalid target type");
+        }
+    }
+
     /** Releases the bound reference. */
     void reset() { _ptr.clear(); }
 

diff --git a/hilti/runtime/include/types/regexp.h b/hilti/runtime/include/types/regexp.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <memory>
-#include <optional>
 #include <string>
 #include <tuple>
 #include <utility>

diff --git a/hilti/runtime/include/types/stream.h b/hilti/runtime/include/types/stream.h
@@ -5,16 +5,13 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
-#include <cinttypes>
 #include <cstddef>
 #include <cstring>
-#include <limits>
 #include <memory>
 #include <optional>
 #include <string>
 #include <tuple>
 #include <utility>
-#include <variant>
 #include <vector>
 
 #include <hilti/rt/any.h>

diff --git a/hilti/runtime/include/types/time.h b/hilti/runtime/include/types/time.h
@@ -6,7 +6,6 @@
 
 #include <limits>
 #include <string>
-#include <variant>
 
 #include <hilti/rt/extension-points.h>
 #include <hilti/rt/types/interval.h>

diff --git a/hilti/runtime/include/types/vector.h b/hilti/runtime/include/types/vector.h
@@ -16,7 +16,6 @@
 #include <cinttypes>
 #include <cstddef>
 #include <cstdint>
-#include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <memory>
@@ -546,17 +545,20 @@ inline bool operator!=(const Empty& /*unused*/, const Vector<T, Allocator>& v) {
     return ! v.empty();
 }
 
-template<typename Allocator, typename I, typename O, typename C>
-Vector<O, Allocator> make(const C& input, std::function<O(I)> func) {
+template<typename Allocator, typename C, typename Func>
+auto make(const C& input, Func&& func) {
+    using O = typename std::result_of_t<Func(typename C::value_type)>;
     Vector<O, Allocator> output;
+    output.reserve(input.size());
     for ( auto&& i : input )
         output.emplace_back(func(i));
 
     return output;
 }
 
-template<typename Allocator, typename I, typename O, typename C>
-Vector<O, Allocator> make(const C& input, std::function<O(I)> func, std::function<bool(I)> pred) {
+template<typename Allocator, typename C, typename Func, typename Pred>
+auto make(const C& input, Func&& func, Pred&& pred) {
+    using O = typename std::result_of_t<Func(typename C::value_type)>;
     Vector<O, Allocator> output;
     for ( auto&& i : input )
         if ( pred(i) )

diff --git a/hilti/runtime/include/util.h b/hilti/runtime/include/util.h
@@ -6,8 +6,6 @@
 
 #include <algorithm>
 #include <list>
-#include <memory>
-#include <numeric>
 #include <optional>
 #include <set>
 #include <string>