We'll need this fix: https://webrtc.googlesource.com/src/+/bda78c9464f4d0e6ff26b0035624a967269c3b0a Dan, do you know if this will be included in the next webrtc merge, and/or can I cherry pick this patch in the meantime? Thanks!

I'm afraid you'll need to cherry pick. The next webrtc merge will be of branch 64, which is from mid-January.

Can I just land this as-is? Or do I need to leave a .patch file in the tree somewhere? I don't see any existing ones under media/webrtc.

Comment on attachment 8974144 [details] [diff] [review] Cherry-pick upstream webrtc asan build fix Review of attachment 8974144 [details] [diff] [review]: ----------------------------------------------------------------- lgtm, thanks! Don't worry about a patch file, the update after branch 64 will include this anyway.

Pushed by dmajor@mozilla.com: https://hg.mozilla.org/integration/mozilla-inbound/rev/d5b4c508bebd Merge upstream webrtc fix for build bustage with clang trunk. r=dminor