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