diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2022-09-06 10:03:40 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-09-06 17:21:01 +0200 |
| commit | 5fc30c371cdabb1a4e941ad8dc0f8ac631696f04 (patch) | |
| tree | 5d6687204a9836a2049e90518129345f0208fb1b /pkg/csource | |
| parent | 65aea2b994281900c86e05e385151383b53a791f (diff) | |
Revert "pkg/csource: inline void* cast into generated code"
This reverts commit 922294abb4c0bc72b24d8526d625110d73fa1b5a.
The commit reported to cause old warnings on s390x:
https://github.com/google/syzkaller/commit/922294abb4c0bc72b24d8526d625110d73fa1b5a#commitcomment-83096994
Diffstat (limited to 'pkg/csource')
| -rw-r--r-- | pkg/csource/csource.go | 2 | ||||
| -rw-r--r-- | pkg/csource/generated.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go index cec1d7847..8671a57db 100644 --- a/pkg/csource/csource.go +++ b/pkg/csource/csource.go @@ -343,7 +343,7 @@ func (ctx *context) emitCallBody(w *bytes.Buffer, call prog.ExecCall, native boo if args != "" { args = args[1:] } - fmt.Fprintf(w, "((intptr_t(*)(%v))(void*)(%v))(", args, callName) + fmt.Fprintf(w, "((intptr_t(*)(%v))CAST(%v))(", args, callName) } for ai, arg := range call.Args { if native || ai > 0 { diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 9e413e508..874c8d72d 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -2312,6 +2312,7 @@ static int do_sandbox_none(void) return 0; } #endif +#define CAST(f) ({void* p = (void*)f; p; }) #elif GOOS_linux @@ -10413,6 +10414,7 @@ static void setup_802154() #if GOARCH_s390x #include <sys/mman.h> +#define CAST(f) ({void* p = (void*)f; p; }) #endif #if SYZ_EXECUTOR || __NR_syz_fuse_handle_req |