diff options
author | YU Jincheng <shana@zju.edu.cn> | 2021-10-10 02:19:51 +0800 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-10-09 22:30:45 +0200 |
commit | 5156b245536ce0f07165793f07c63fd9fa5dd3b7 (patch) | |
tree | 3b73b7ea8ed1830d9cc13cbce1da6918926553e2 /shell | |
parent | 04ad683bf99333c2a6c6fd6549faa67978ad9a98 (diff) | |
download | busybox-w32-5156b245536ce0f07165793f07c63fd9fa5dd3b7.tar.gz busybox-w32-5156b245536ce0f07165793f07c63fd9fa5dd3b7.tar.bz2 busybox-w32-5156b245536ce0f07165793f07c63fd9fa5dd3b7.zip |
Make const ptr assign as function call in clang
- This can act as memory barrier in clang to avoid
read before assign of a const ptr
Signed-off-by: LoveSy <shana@zju.edu.cn>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 199975191..2d3cc8a61 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -504,7 +504,7 @@ extern struct globals_misc *BB_GLOBAL_CONST ash_ptr_to_globals_misc; | |||
504 | #define random_gen (G_misc.random_gen ) | 504 | #define random_gen (G_misc.random_gen ) |
505 | #define backgndpid (G_misc.backgndpid ) | 505 | #define backgndpid (G_misc.backgndpid ) |
506 | #define INIT_G_misc() do { \ | 506 | #define INIT_G_misc() do { \ |
507 | ASSIGN_CONST_PTR(ash_ptr_to_globals_misc, xzalloc(sizeof(G_misc))); \ | 507 | XZALLOC_CONST_PTR(&ash_ptr_to_globals_misc, sizeof(G_misc)); \ |
508 | savestatus = -1; \ | 508 | savestatus = -1; \ |
509 | curdir = nullstr; \ | 509 | curdir = nullstr; \ |
510 | physdir = nullstr; \ | 510 | physdir = nullstr; \ |
@@ -1582,7 +1582,7 @@ extern struct globals_memstack *BB_GLOBAL_CONST ash_ptr_to_globals_memstack; | |||
1582 | #define g_stacknleft (G_memstack.g_stacknleft) | 1582 | #define g_stacknleft (G_memstack.g_stacknleft) |
1583 | #define stackbase (G_memstack.stackbase ) | 1583 | #define stackbase (G_memstack.stackbase ) |
1584 | #define INIT_G_memstack() do { \ | 1584 | #define INIT_G_memstack() do { \ |
1585 | ASSIGN_CONST_PTR(ash_ptr_to_globals_memstack, xzalloc(sizeof(G_memstack))); \ | 1585 | XZALLOC_CONST_PTR(&ash_ptr_to_globals_memstack, sizeof(G_memstack)); \ |
1586 | g_stackp = &stackbase; \ | 1586 | g_stackp = &stackbase; \ |
1587 | g_stacknxt = stackbase.space; \ | 1587 | g_stacknxt = stackbase.space; \ |
1588 | g_stacknleft = MINSIZE; \ | 1588 | g_stacknleft = MINSIZE; \ |
@@ -2213,7 +2213,7 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var; | |||
2213 | #endif | 2213 | #endif |
2214 | #define INIT_G_var() do { \ | 2214 | #define INIT_G_var() do { \ |
2215 | unsigned i; \ | 2215 | unsigned i; \ |
2216 | ASSIGN_CONST_PTR(ash_ptr_to_globals_var, xzalloc(sizeof(G_var))); \ | 2216 | XZALLOC_CONST_PTR(&ash_ptr_to_globals_var, sizeof(G_var)); \ |
2217 | for (i = 0; i < ARRAY_SIZE(varinit_data); i++) { \ | 2217 | for (i = 0; i < ARRAY_SIZE(varinit_data); i++) { \ |
2218 | varinit[i].flags = varinit_data[i].flags; \ | 2218 | varinit[i].flags = varinit_data[i].flags; \ |
2219 | varinit[i].var_text = varinit_data[i].var_text; \ | 2219 | varinit[i].var_text = varinit_data[i].var_text; \ |