diff --git a/appveyor.yml b/appveyor.yml
index d70ad54b1c812..0ec4210af98b2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -207,7 +207,10 @@ test_script:
   - sh src/ci/init_repo.sh . /c/cache/rustsrc
   - set SRC=.
   - set NO_CCACHE=1
-  - sh src/ci/run.sh
+  # Added this debugging code to try tracking down https://github.com/rust-lang/rust/issues/58160
+  # Replace it with the commented line below after the issue with AppVeyor is fixed
+  - "sh src/ci/run.sh & set ret=%errorlevel% & echo exit code in appveyor.yml: %ret% & exit %ret%"
+#  - sh src/ci/run.sh
 
 on_failure:
   # Dump crash log
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 0f2517c7d1f55..0841e70a6ed29 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -127,7 +127,13 @@ if [ ! -z "$SCRIPT" ]; then
   set +e
   sh -x -c "$SCRIPT"
   ret=$?
-  echo "script exited with $ret"
+  echo "exit code in src/ci/run.sh: $ret"
+
+  echo "tasklist:"
+  tasklist
+  echo -n "location of sh: "
+  where sh
+
   exit $ret
 else
   do_make() {