Merge pull request #12258 from JuliaLang/tk/backportwin64

backport fix for #7942

appveyor.yml

@@ -2,8 +2,6 @@ environment:
   matrix:
   - ARCH: "i686"
   - ARCH: "x86_64"
-    JULIA_CPU_CORES: 1
-# Run win64 tests in serial for now to avoid #7942 causing timeouts
 
 # Only build on master and PR's for now, not personal branches
 # Whether or not PR's get built is determined in the webhook settings

contrib/windows/msys_build.sh

@@ -9,8 +9,21 @@ cd `dirname "$0"`/../..
 # Stop on error
 set -e
 
-# Fail fast on AppVeyor if there are newer pending commits in this PR
 curlflags="curl --retry 10 -k -L -y 5"
+checksum_download() {
+  # checksum_download filename url
+  f=$1
+  url=$2
+  if [ -e "$f" ]; then
+    deps/jlchecksum "$f" 2> /dev/null && return
+    echo "Checksum for '$f' changed, download again." >&2
+  fi
+  echo "Downloading '$f'"
+  $curlflags -O "$url"
+  deps/jlchecksum "$f"
+}
+
+# Fail fast on AppVeyor if there are newer pending commits in this PR
 if [ -n "$APPVEYOR_PULL_REQUEST_NUMBER" ]; then
   # download a handy cli json parser
   if ! [ -e jq.exe ]; then
@@ -100,14 +113,11 @@ mkdir -p usr/Git/tmp
 rm -f usr/bin/libjulia.dll
 rm -f usr/bin/libjulia-debug.dll
 
-mingw=http://sourceforge.net/projects/mingw
 if [ -z "$USEMSVC" ]; then
   if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" ]; then
     f=$ARCH-4.9.2-release-win32-$exc-rt_v4-rev3.7z
-    if ! [ -e $f ]; then
-      echo "Downloading $f"
-      $curlflags -O $mingw-w64/files/Toolchains%20targetting%20Win$bits/Personal%20Builds/mingw-builds/4.9.2/threads-win32/$exc/$f
-    fi
+    checksum_download \
+        "$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
     echo "Extracting $f"
     $SEVENZIP x -y $f >> get-deps.log
     export PATH=$PATH:$PWD/mingw$bits/bin
@@ -136,10 +146,8 @@ else
   f=llvm-3.3-$ARCH-msvc12-juliadeps.7z
 fi
 
-if ! [ -e $f ]; then
-  echo "Downloading $f"
-  $curlflags -O http://sourceforge.net/projects/juliadeps-win/files/$f
-fi
+checksum_download \
+    "$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
 echo "Extracting $f"
 $SEVENZIP x -y $f >> get-deps.log
 echo 'LLVM_CONFIG = $(JULIAHOME)/usr/bin/llvm-config' >> Make.user
@@ -160,7 +168,7 @@ if [ -z "`which make 2>/dev/null`" ]; then
   f="/make/make-3.81-2/make-3.81-2-msys-1.0.11-bin.tar"
   if ! [ -e `basename $f.lzma` ]; then
     echo "Downloading `basename $f`"
-    $curlflags -O $mingw/files/MSYS/Base$f.lzma
+    $curlflags -O http://sourceforge.net/projects/mingw/files/MSYS/Base$f.lzma
   fi
   $SEVENZIP x -y `basename $f.lzma` >> get-deps.log
   tar -xf `basename $f`

deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/md5

@@ -0,0 +1 @@
+6217dae4a1016b37b12aeed1cc950187

deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/sha512

@@ -0,0 +1 @@
+1f38cc758725f124552285940cde6d9e072a594298a09f7a542a6cc28cb25d119d80d73918e4e9207694819825787abb6eba4a83cee5892e5acaf6350221b97f

deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/md5

@@ -0,0 +1 @@
+e10c7a38c00bd79925c5ca60668cdc04

deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/sha512

@@ -0,0 +1 @@
+fea52f6b115767fea76fa501cf29e96922cba5a5738e21fd83ddf90754bacbdd811adb0579cdf3072b0165619c27097b957e3013cbb358c586c68cf8cf903622

deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/md5

@@ -0,0 +1 @@
+311a181c91e3b176fe780e53bccbf445

deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/sha512

@@ -0,0 +1 @@
+6c34119a4c162afd6425d90b950115eaf87abfce99186cf4a593c69562871e66941542992cdaf96cdcd78e2dda0656b8b0aa0d3682a06ae9bfdfa33607402366

deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/md5

@@ -0,0 +1 @@
+b138576c92c425e8fa171a9d98e13b86

deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/sha512

@@ -0,0 +1 @@
+50dcb3aaab3e53d5ff4561079272daf473bacc8d7a2a3720e7c594ae6e402123cb3cc6f3eabaf67df8d94fa5c01bb3e45b5bb1bc7cbb87cd2beb6b5664e02072

src/debuginfo.cpp

@@ -673,6 +673,8 @@ class JITMemoryManagerWin : public JITMemoryManager {
   virtual uint8_t *getGOTBase() const { return JMM->getGOTBase(); }
   virtual uint8_t *startFunctionBody(const Function *F,
                                      uintptr_t &ActualSize) {
+      if (ActualSize == 0)
+          ActualSize += 64;
       ActualSize += 48;
       uint8_t *mem = JMM->startFunctionBody(F,ActualSize);
       ActualSize -= 48;