Merge pull request JuliaLang#14872 from JuliaLang/tk/morellvmclose

Another fixed-by-llvm-upgrade test, and other miscellanea
jiahao · Jan 31, 2016 · d550b37 · d550b37
2 parents 278d128 + cece06f
commit d550b37
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 7 deletions.
diff --git a/contrib/windows/msys_build.sh b/contrib/windows/msys_build.sh
@@ -120,7 +120,7 @@ if [ -z "$USEMSVC" ]; then
  fi
  export AR=${CROSS_COMPILE}ar
 
- f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r03.7z
+ f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r04.7z
 else
  echo "override USEMSVC = 1" >> Make.user
  echo "override ARCH = $ARCH" >> Make.user
@@ -140,7 +140,8 @@ checksum_download \
  "$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
 echo "Extracting $f"
 $SEVENZIP x -y $f >> get-deps.log
-echo 'override LLVM_CONFIG = $(JULIAHOME)/usr/bin/llvm-config.exe' >> Make.user
+echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/tools/llvm-config.exe' >> Make.user
+echo 'override LLVM_SIZE := $(JULIAHOME)/usr/tools/llvm-size.exe' >> Make.user
 
 if [ -z "`which make 2>/dev/null`" ]; then
  if [ -n "`uname | grep CYGWIN`" ]; then

diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/md5 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/md5
diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/sha512 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/sha512
diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5
@@ -0,0 +1 @@
+d639c06cdad6b7c55c1dbdb82e3def15
diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512
@@ -0,0 +1 @@
+93785655d61d3eec63a1834669153148102171115982bfc01011a1f154192395ee7e787efc52047dc63a2887a11832ae3faccd7cf3fae4b168ffcd160786adee
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/md5 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/md5
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/sha512 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/sha512
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5
@@ -0,0 +1 @@
+f27bdc73c67ce670b30a2494dcf82e58
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512
@@ -0,0 +1 @@
+a61e0564816427be4c8d5005077354f01b9c4cb1c0abb1c6ccedf90b44654be4350edabe9a0c5fcd52833f1c4caa6aa286713879bec2eae96cb848c5422113c1
diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -257,7 +257,7 @@ void jl_dump_objfile(char *fname, int jit_model, const char *sysimg_data, size_t
 int32_t jl_get_llvm_gv(jl_value_t *p);
 void jl_idtable_rehash(jl_array_t **pa, size_t newsz);
 
-jl_methtable_t *jl_new_method_table(jl_sym_t *name, jl_module_t *module);
+JL_DLLEXPORT jl_methtable_t *jl_new_method_table(jl_sym_t *name, jl_module_t *module);
 jl_lambda_info_t *jl_get_specialization1(jl_tupletype_t *types, void *cyclectx);
 jl_function_t *jl_module_get_initializer(jl_module_t *m);
 uint32_t jl_module_next_counter(jl_module_t *m);

diff --git a/test/numbers.jl b/test/numbers.jl
@@ -933,6 +933,9 @@ end
 @test 2.0^63 != UInt64(2)^63+1
 
 @test typemax(UInt64) != 2.0^64
+# issue #9085
+f9085() = typemax(UInt64) != 2.0^64
+@test f9085()
 
 @test typemax(UInt64) < Float64(typemax(UInt64))
 @test typemax(Int64) < Float64(typemax(Int64))