[release-branch.go1.24] runtime/cgo: avoid errors from -Wdeclaration-after-statement

CL 652181 accidentally missed this iPhone only code.

For #71961
For #71963

Change-Id: I567f8bb38958907442e69494da330d5199d11f54
Reviewed-on: https://go-review.googlesource.com/c/go/+/653137
Commit-Queue: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/runtime/cgo/gcc_darwin_arm64.c b/src/runtime/cgo/gcc_darwin_arm64.c
index 4b34692957bac36ee4442dea0105fa4afaa406b5..e800e9303c0a7a0822a8f23bc2afdf92d7fa2789 100644 (file)
--- a/src/runtime/cgo/gcc_darwin_arm64.c
+++ b/src/runtime/cgo/gcc_darwin_arm64.c
@@ -76,19 +76,27 @@ threadentry(void *v)
 static void
 init_working_dir()
 {
-       CFBundleRef bundle = CFBundleGetMainBundle();
+       CFBundleRef bundle;
+       CFURLRef url_ref;
+       CFStringRef url_str_ref;
+       char buf[MAXPATHLEN];
+       Boolean res;
+       int url_len;
+       char *dir;
+       CFStringRef wd_ref;
+
+       bundle = CFBundleGetMainBundle();
        if (bundle == NULL) {
                fprintf(stderr, "runtime/cgo: no main bundle\n");
                return;
        }
-       CFURLRef url_ref = CFBundleCopyResourceURL(bundle, CFSTR("Info"), CFSTR("plist"), NULL);
+       url_ref = CFBundleCopyResourceURL(bundle, CFSTR("Info"), CFSTR("plist"), NULL);
        if (url_ref == NULL) {
                // No Info.plist found. It can happen on Corellium virtual devices.
                return;
        }
-       CFStringRef url_str_ref = CFURLGetString(url_ref);
-       char buf[MAXPATHLEN];
-       Boolean res = CFStringGetCString(url_str_ref, buf, sizeof(buf), kCFStringEncodingUTF8);
+       url_str_ref = CFURLGetString(url_ref);
+       res = CFStringGetCString(url_str_ref, buf, sizeof(buf), kCFStringEncodingUTF8);
        CFRelease(url_ref);
        if (!res) {
                fprintf(stderr, "runtime/cgo: cannot get URL string\n");
@@ -97,13 +105,13 @@ init_working_dir()
 
        // url is of the form "file:///path/to/Info.plist".
        // strip it down to the working directory "/path/to".
-       int url_len = strlen(buf);
+       url_len = strlen(buf);
        if (url_len < sizeof("file://")+sizeof("/Info.plist")) {
                fprintf(stderr, "runtime/cgo: bad URL: %s\n", buf);
                return;
        }
        buf[url_len-sizeof("/Info.plist")+1] = 0;
-       char *dir = &buf[0] + sizeof("file://")-1;
+       dir = &buf[0] + sizeof("file://")-1;
 
        if (chdir(dir) != 0) {
                fprintf(stderr, "runtime/cgo: chdir(%s) failed\n", dir);
@@ -111,7 +119,7 @@ init_working_dir()
 
        // The test harness in go_ios_exec passes the relative working directory
        // in the GoExecWrapperWorkingDirectory property of the app bundle.
-       CFStringRef wd_ref = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("GoExecWrapperWorkingDirectory"));
+       wd_ref = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("GoExecWrapperWorkingDirectory"));
        if (wd_ref != NULL) {
                if (!CFStringGetCString(wd_ref, buf, sizeof(buf), kCFStringEncodingUTF8)) {
                        fprintf(stderr, "runtime/cgo: cannot get GoExecWrapperWorkingDirectory string\n");