1 |
From 999566402e3d7c69032bbf47e28b44fc0926fe62 Mon Sep 17 00:00:00 2001 |
2 |
From: Christopher Wellons <wellons@nullprogram.com> |
3 |
Date: Sun, 18 Jul 2021 16:57:19 -0400 |
4 |
Subject: [PATCH] Change "uint" to "unsigned" |
5 |
|
6 |
This fixes a defect introduced in 25162c795. The "uint" type has not |
7 |
been explicitly defined here on mingw, causing compilation to fail. |
8 |
|
9 |
On linux we have this in /usr/include/sys/types.h |
10 |
|
11 |
/* Old compatibility names for C types. */ |
12 |
typedef unsigned long int ulong; |
13 |
typedef unsigned short int ushort; |
14 |
typedef unsigned int uint; |
15 |
|
16 |
So it's easy to see how such bugs can creep in. |
17 |
|
18 |
* rust-demangle.c (struct rust_demangler): Change type of |
19 |
"recursion" to unsigned. |
20 |
(RUST_NO_RECURSION_LIMIT): Similarly in cast. |
21 |
--- |
22 |
libiberty/ChangeLog | 6 ++++++ |
23 |
libiberty/rust-demangle.c | 4 ++-- |
24 |
2 files changed, 8 insertions(+), 2 deletions(-) |
25 |
|
26 |
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog |
27 |
index 8e39fd28eba..3f749455f05 100644 |
28 |
--- a/libiberty/ChangeLog |
29 |
+++ b/libiberty/ChangeLog |
30 |
@@ -1,3 +1,9 @@ |
31 |
+2021-07-19 Christopher Wellons <wellons@nullprogram.com> |
32 |
+ |
33 |
+ * rust-demangle.c (struct rust_demangler): Change type of |
34 |
+ "recursion" to unsigned. |
35 |
+ (RUST_NO_RECURSION_LIMIT): Similarly in cast. |
36 |
+ |
37 |
2021-07-15 Nick Clifton <nickc@redhat.com> |
38 |
|
39 |
PR 99935 |
40 |
diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c |
41 |
index df09b7b8fdd..ac1eb8eb02c 100644 |
42 |
--- a/libiberty/rust-demangle.c |
43 |
+++ b/libiberty/rust-demangle.c |
44 |
@@ -75,10 +75,10 @@ struct rust_demangler |
45 |
int version; |
46 |
|
47 |
/* Recursion depth. */ |
48 |
- uint recursion; |
49 |
+ unsigned recursion; |
50 |
/* Maximum number of times demangle_path may be called recursively. */ |
51 |
#define RUST_MAX_RECURSION_COUNT 1024 |
52 |
-#define RUST_NO_RECURSION_LIMIT ((uint) -1) |
53 |
+#define RUST_NO_RECURSION_LIMIT ((unsigned) -1) |
54 |
|
55 |
uint64_t bound_lifetime_depth; |
56 |
}; |
57 |
-- |
58 |
2.32.0 |
59 |
|