0012.patch (2036B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Thu, 16 Jan 2025 11:29:00 -0600 3 Subject: Bug 1935474 - don't demangle rust symbols. r?ng! 4 5 Building demangle.cc causes errors in our hazard-linux64-haz/debug build. 6 For now, we'll avoid calling DemangleRustSymbolEncoding, and skip building 7 demangle.cc. 8 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/828151aa9455ccbfe45787bbe00127813c97cc9e 9 --- 10 abseil-cpp/absl/debugging/BUILD.gn | 4 ++++ 11 abseil-cpp/absl/debugging/internal/demangle.cc | 4 ++++ 12 2 files changed, 8 insertions(+) 13 14 diff --git a/abseil-cpp/absl/debugging/BUILD.gn b/abseil-cpp/absl/debugging/BUILD.gn 15 index 9041c59ddad..ed1d087c90d 100644 16 --- a/abseil-cpp/absl/debugging/BUILD.gn 17 +++ b/abseil-cpp/absl/debugging/BUILD.gn 18 @@ -187,6 +187,9 @@ absl_test("decode_rust_punycode_test") { 19 } 20 21 absl_source_set("demangle_rust") { 22 +# hazard-linux64-haz/debug builds fail when this section is 23 +# included in the build. 24 +if (!moz_webrtc_build) { 25 sources = [ "internal/demangle_rust.cc" ] 26 public = [ "internal/demangle_rust.h" ] 27 deps = [ 28 @@ -195,6 +198,7 @@ absl_source_set("demangle_rust") { 29 "//third_party/abseil-cpp/absl/base:core_headers", 30 ] 31 } 32 +} 33 34 absl_test("demangle_rust_test") { 35 sources = [ "internal/demangle_rust_test.cc" ] 36 diff --git a/abseil-cpp/absl/debugging/internal/demangle.cc b/abseil-cpp/absl/debugging/internal/demangle.cc 37 index dc15b8e5849..13683bec9e7 100644 38 --- a/abseil-cpp/absl/debugging/internal/demangle.cc 39 +++ b/abseil-cpp/absl/debugging/internal/demangle.cc 40 @@ -2957,9 +2957,13 @@ static bool Overflowed(const State *state) { 41 42 // The demangler entry point. 43 bool Demangle(const char* mangled, char* out, size_t out_size) { 44 +// mozilla - hazard-linux64-haz/debug failure when demangle_rust.cc is 45 +// included in the build. For now we'll avoid this code. 46 +#if 0 47 if (mangled[0] == '_' && mangled[1] == 'R') { 48 return DemangleRustSymbolEncoding(mangled, out, out_size); 49 } 50 +#endif 51 52 State state; 53 InitState(&state, mangled, out, out_size);