Skip to content

[pull] master from google:master #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 10, 2026
Merged

[pull] master from google:master #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
920b84d
Integrate LLVM at llvm/llvm-project@e30271b35d8d
a-googler Sep 10, 2026
46184c7
tailscale: Update build.sh to use fuzz script in tailscale repo (#15996)
jentfoo Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions infra/indexer/frontend/ast_visitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "clang/Sema/Sema.h"
#include "llvm/ADT/APSInt.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallSet.h"
Expand Down Expand Up @@ -139,9 +140,9 @@ const clang::ClassTemplateSpecializationDecl* FindSpecialization(
// lead to loading external specializations. Arguably this could have been
// handled through `mutable` fields because logically this doesn't affect the
// forthcoming behavior of the object.
void* insert_pos = nullptr;
llvm::FoldingSetInsertToken insert_token;
return const_cast<clang::ClassTemplateDecl*>(class_template_decl)
->findSpecialization(canonical_args, insert_pos);
->findSpecialization(canonical_args, insert_token);
}

// Helper functions to find the closest explicit template specialization that
Expand Down
14 changes: 8 additions & 6 deletions projects/tailscale/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder-go
RUN apt-get update && apt-get install -y wget

# The Go version is intentionally not pinned here. tailscale's go.mod (`go`
# directive) is the single source of truth; GOTOOLCHAIN=auto fetches a matching
# toolchain at build time if the base image's bundled Go is older, and
# fuzz/oss-fuzz.sh copies it to a writable dir so go-118-fuzz-build_v2 can
# overlay its testing/fuzz.go. Bumping Go = editing go.mod in the tailscale repo;
# this Dockerfile stays untouched.

RUN git clone --depth 1 https://github.com/tailscale/tailscale
RUN wget https://go.dev/dl/go1.23.1.linux-amd64.tar.gz \
&& mkdir temp-go \
&& rm -rf /root/.go/* \
&& tar -C temp-go/ -xzf go1.23.1.linux-amd64.tar.gz \
&& mv temp-go/go/* /root/.go/

COPY build.sh $SRC/
WORKDIR $SRC/tailscale
2 changes: 1 addition & 1 deletion projects/tailscale/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
################################################################################

compile_go_fuzzer tailscale.com/net/stun FuzzStunParser stun_parser_fuzzer
bash -x ./fuzz/oss-fuzz.sh
Loading