Skip to content

Commit

Permalink
Drop check for libc++ >= 15
Browse files Browse the repository at this point in the history
We have required LLVM 15 for a while.

- Don't mark workerd binary as no-arm64, which caused problems for
  downstream where it still needs to be built.
  • Loading branch information
fhanau committed Nov 13, 2024
1 parent ba3591c commit 3078a03
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
10 changes: 0 additions & 10 deletions src/workerd/jsg/iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,13 @@ class GeneratorImpl {
friend Generator;
};

#if _LIBCPP_VERSION >= 15000
template <class Func, class T>
concept GeneratorCallback = std::invocable<Func, Lock&, T, GeneratorContext<T>&> &&
std::same_as<void, std::invoke_result_t<Func, Lock&, T, GeneratorContext<T>&>>;

template <class Func, class T>
concept AsyncGeneratorCallback = std::invocable<Func, Lock&, T, GeneratorContext<T>&> &&
std::same_as<Promise<void>, std::invoke_result_t<Func, Lock&, T, GeneratorContext<T>&>>;
#else
// These don't work in libc++ 11. I haven't tried 12-14, but they do work in 15. So we'll just
// skip the extra type checking if we don't have libc++ 15 or newer.
template <class Func, class T>
concept GeneratorCallback = true;

template <class Func, class T>
concept AsyncGeneratorCallback = true;
#endif

template <typename T>
class Generator final {
Expand Down
1 change: 0 additions & 1 deletion src/workerd/server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ wd_cc_binary(
name = "workerd",
srcs = ["workerd.c++"],
malloc = ":malloc",
tags = ["no-arm64"],
visibility = ["//visibility:public"],
deps = [
":server",
Expand Down

0 comments on commit 3078a03

Please sign in to comment.