Update build scripts for LLVM 10

ErikMcClure · ErikMcClure · commit 513491a18702 · 2020-04-26T17:52:58.000-07:00
diff --git a/build-lld.ps1 b/build-lld.ps1
diff --git a/build-lld.sh b/build-lld.sh
diff --git a/build-llvm.ps1 b/build-llvm.ps1
@@ -21,8 +21,8 @@ invoke-expression -Command ..\get-cmake.ps1
 
 pushd llvm
 
-..\cmake\bin\cmake.exe "-Tv142,host=$arch" -DCMAKE_GENERATOR_PLATFORM="$platform" -DLLVM_TARGETS_TO_BUILD="X86;WebAssembly" -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_ENABLE_ZLIB=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_CXX_FLAGS_RELEASE="/MT" -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT" -DCMAKE_CXX_FLAGS_DEBUG="/MTd" ../../llvm-project/llvm
- 
+..\cmake\bin\cmake.exe "-Tv142,host=$arch" -DCMAKE_GENERATOR_PLATFORM="$platform" -DCMAKE_CXX_STANDARD="17" -DLLVM_TARGETS_TO_BUILD="X86;WebAssembly" -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_ENABLE_ZLIB=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_CXX_FLAGS="/D _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /D _CRT_SECURE_NO_WARNINGS" -DCMAKE_CXX_FLAGS_DEBUG="/MTd" -DLLVM_USE_CRT_RELEASE="MT" -DLLVM_USE_CRT_MINSIZEREL="MT" -DLLVM_USE_CRT_RELWITHDEBINFO="MT" ../../llvm-project/llvm -DLLVM_ENABLE_PROJECTS="lld"
+  
 ..\cmake\bin\cmake.exe --build . --config MinSizeRel
 ..\cmake\bin\cmake.exe --build . --config Debug
 
@@ -38,5 +38,6 @@ popd
 popd
 
 robocopy "llvm-project\llvm\include" "$bin\llvm\include" *.h *.inc *.def *.td *.modulemap /S /XO /XN /XC
+robocopy "llvm-project\lld\include" "$bin\llvm\include" *.h *.inc *.def *.td *.modulemap /S /XO /XN /XC
 
 echo "Finished building LLVM!"
diff --git a/build-llvm.sh b/build-llvm.sh
@@ -6,7 +6,7 @@ cd bin/llvm
 
 if [ $# -gt 0 ] && [ "$1" = "ninja" ]; then
   echo "Using Ninja"
-  cmake -GNinja ../../llvm-project/llvm -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE:STRING="MinSizeRel" -DLLVM_TARGETS_TO_BUILD:STRING="X86;WebAssembly" -DLLVM_BUILD_LLVM_DYLIB:BOOL=OFF -DLLVM_ENABLE_TERMINFO:BOOL=OFF -DLLVM_INCLUDE_DOCS:BOOL=OFF -DLLVM_OPTIMIZED_TABLEGEN:BOOL=ON -DLLVM_INCLUDE_EXAMPLES:BOOL=OFF -DLLVM_INCLUDE_TESTS:BOOL=OFF -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF -DLLVM_ENABLE_ZLIB:BOOL=OFF -DLLVM_APPEND_VC_REV:BOOL=OFF
+  cmake -GNinja ../../llvm-project/llvm -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE:STRING="MinSizeRel" -DCMAKE_CXX_STANDARD:STRING="17" -DLLVM_TARGETS_TO_BUILD:STRING="X86;WebAssembly" -DLLVM_BUILD_LLVM_DYLIB:BOOL=OFF -DLLVM_ENABLE_TERMINFO:BOOL=OFF -DLLVM_INCLUDE_DOCS:BOOL=OFF -DLLVM_OPTIMIZED_TABLEGEN:BOOL=ON -DLLVM_INCLUDE_EXAMPLES:BOOL=OFF -DLLVM_INCLUDE_TESTS:BOOL=OFF -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF -DLLVM_ENABLE_ZLIB:BOOL=OFF -DLLVM_APPEND_VC_REV:BOOL=OFF
   if [ $? -eq 0 ]
   then
       ninja
@@ -20,7 +20,7 @@ else
     CORES=1
   fi
   echo "Using Make with" $CORES "cores"
-  cmake ../../llvm-project/llvm -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE:STRING="MinSizeRel" -DLLVM_TARGETS_TO_BUILD:STRING="X86;WebAssembly" -DLLVM_BUILD_LLVM_DYLIB:BOOL=OFF -DLLVM_ENABLE_TERMINFO:BOOL=OFF -DLLVM_INCLUDE_DOCS:BOOL=OFF -DLLVM_OPTIMIZED_TABLEGEN:BOOL=ON -DLLVM_INCLUDE_EXAMPLES:BOOL=OFF -DLLVM_INCLUDE_TESTS:BOOL=OFF -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF -DLLVM_ENABLE_ZLIB:BOOL=OFF -DLLVM_APPEND_VC_REV:BOOL=OFF
+  cmake ../../llvm-project/llvm -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE:STRING="MinSizeRel" -DCMAKE_CXX_STANDARD:STRING="17" -DLLVM_TARGETS_TO_BUILD:STRING="X86;WebAssembly" -DLLVM_BUILD_LLVM_DYLIB:BOOL=OFF -DLLVM_ENABLE_TERMINFO:BOOL=OFF -DLLVM_INCLUDE_DOCS:BOOL=OFF -DLLVM_OPTIMIZED_TABLEGEN:BOOL=ON -DLLVM_INCLUDE_EXAMPLES:BOOL=OFF -DLLVM_INCLUDE_TESTS:BOOL=OFF -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF -DLLVM_ENABLE_ZLIB:BOOL=OFF -DLLVM_APPEND_VC_REV:BOOL=OFF
   if [ $? -eq 0 ]
   then
       make -j $CORES
@@ -34,3 +34,7 @@ cd ../..
 cd llvm-project/llvm/include/
 find ./ -type f \( -iname \*.h -o -iname \*.inc -o -iname \*.def -o -iname \*.td -o -iname \*.modulemap \) -exec cp --parents {} ../../../bin/llvm/include/ -n \;
 cd ../../..
+
+cd llvm-project/lld/include/
+find ./ -type f \( -iname \*.h -o -iname \*.inc -o -iname \*.def -o -iname \*.td -o -iname \*.modulemap \) -exec cp --parents {} ../../../bin/llvm/include/ -n \;
+cd ../../..
diff --git a/get-cmake.ps1 b/get-cmake.ps1
@@ -1,4 +1,4 @@
-$cmakever = "3.15.4"
+$cmakever = "3.17.1"
 
 # If we can't find CMake, download it
 if(!(Test-Path "./cmake/bin/cmake.exe" -PathType Leaf))
diff --git a/include/innative/innative.h b/include/innative/innative.h
@@ -19,7 +19,7 @@ limitations under the License.
 
 #define INNATIVE_VERSION_MAJOR       0
 #define INNATIVE_VERSION_MINOR       1
-#define INNATIVE_VERSION_REVISION    6
+#define INNATIVE_VERSION_REVISION    7
 #define INNATIVE_WASM_MAGIC_COOKIE   0x6d736100
 #define INNATIVE_WASM_MAGIC_VERSION  0x01
 #define INNATIVE_VERSION(v, m, r, b) (((v | 0ULL) << 48) | ((m | 0ULL) << 32) | ((r | 0ULL) << 16) | (b | 0ULL))
diff --git a/innative-runtime-setup/Product.wxs b/innative-runtime-setup/Product.wxs
@@ -10,7 +10,7 @@
   <?error Unknown value for Platform variable ?>
   <?endif ?>
 
-  <?define Version="0.1.6" ?>
+  <?define Version="0.1.7" ?>
   <Product 
     Id="6A27F179-BADF-4580-821D-2892F229F335"
     Name="inNative Runtime v$(var.Version)" 
diff --git a/innative-sdk-setup/Product.wxs b/innative-sdk-setup/Product.wxs
@@ -10,7 +10,7 @@
   <?error Unknown value for Platform variable ?>
   <?endif ?>
 
-  <?define Version="0.1.6" ?>
+  <?define Version="0.1.7" ?>
   <Product 
     Id="25A4AE98-4F30-4735-B29B-37B6EDC5A9E9"
     Name="inNative SDK v$(var.Version)" 
diff --git a/innative-test/benchmark.cpp b/innative-test/benchmark.cpp
@@ -3,6 +3,7 @@
 
 #include "benchmark.h"
 #include <chrono>
+#include <iterator>
 
 Benchmarks::Benchmarks(const INExports& exports, const char* arg0, int loglevel, const path& folder) :
   _exports(exports), _arg0(arg0), _loglevel(loglevel), _folder(folder)
diff --git a/innative/debug_pdb.cpp b/innative/debug_pdb.cpp
@@ -247,13 +247,15 @@ void DebugPDB::Finalize()
           {
             if(element->getBaseType()->getName().startswith("p<"))
             {
-              if(auto basetype = llvm::dyn_cast<llvm::DICompositeType>(element->getBaseType());
-                 basetype->getElements().size() > 0)
-                if(auto baseelement = llvm::dyn_cast<llvm::DIType>(basetype->getElements()[0]);
-                   !baseelement->getName().empty())
+              auto basetype = llvm::dyn_cast<llvm::DICompositeType>(element->getBaseType());
+              if(basetype->getElements().size() > 0)
+              {
+                auto baseelement = llvm::dyn_cast<llvm::DIType>(basetype->getElements()[0]);
+                if(!baseelement->getName().empty())
                   aux += FormatString(true, "{0}:{({1})({2}.m0 + *(unsigned int*)(&amp;this->{0}))}}", element->getName(),
                                       baseelement->getName(), expr[0]->getVariable()->getName(),
                                       element->getOffsetInBits() / 8);
+              }
 
               _compiler->natvis +=
                 FormatString(true, "<Item Name=\"{0}\">({1}*)(*(unsigned int*)({2}.m0+(unsigned int)this+{3}))</Item>",
@@ -281,8 +283,11 @@ void DebugPDB::Finalize()
               for(auto* e : composite->getElements())
               {
                 if(auto* subrange = llvm::dyn_cast<llvm::DISubrange>(e))
-                  if(auto* data = subrange->getCount().dyn_cast<llvm::ConstantInt*>(); true)
+                {
+                  auto* data = subrange->getCount().dyn_cast<llvm::ConstantInt*>(); 
+                  if(data != nullptr)
                     count = data->getSExtValue();
+                }
               }
 
               aux += FormatString(true, "{0}:{this->{0}} ", element->getName());
diff --git a/innative/dwarf_parser.cpp b/innative/dwarf_parser.cpp
@@ -208,9 +208,12 @@ size_t DWARFParser::GetSourceMapTypeRef(llvm::DWARFUnit& unit, const DWARFFormVa
 const char* DWARFParser::GetDieName(const DWARFDie& die)
 {
   SourceMapType key = { die.getOffset() };
-  if(auto iter = kh_get_maptype(maptype, &key); kh_exist2(maptype, iter))
+  auto iter         = kh_get_maptype(maptype, &key);
+
+  if(kh_exist2(maptype, iter))
     if(kh_key(maptype, iter)->name_index < n_names)
       return map->names[kh_key(maptype, iter)->name_index];
+
   return 0;
 }
 
@@ -256,7 +259,9 @@ size_t DWARFParser::GetSourceMapType(llvm::DWARFUnit& unit, const DWARFDie& die)
     SourceMapType* ptype = utility::tmalloc<SourceMapType>(*env, 1);
     ptype->offset        = die.getOffset();
     int r;
-    if(iter = kh_put_maptype(maptype, ptype, &r); r < 0)
+    iter = kh_put_maptype(maptype, ptype, &r); 
+
+    if(r < 0)
       return (size_t)~0;
 
     kh_value(maptype, iter) = n_types++;
@@ -328,7 +333,8 @@ size_t DWARFParser::GetSourceMapType(llvm::DWARFUnit& unit, const DWARFDie& die)
         if(DWARFDie innerdie = AsReferencedDIE(innertype.getValue(), unit))
         {
           ptype->type_index = GetSourceMapType(unit, innerdie);
-          if(auto diename = GetDieName(innerdie); diename != nullptr)
+          auto diename      = GetDieName(innerdie); 
+          if(diename != nullptr)
             basename = diename;
         }
       } // If this is false, it's a void type, like const void*
@@ -403,7 +409,8 @@ size_t DWARFParser::GetSourceMapType(llvm::DWARFUnit& unit, const DWARFDie& die)
         if(DWARFDie innerdie = AsReferencedDIE(innertype.getValue(), unit))
         {
           ptype->type_index = GetSourceMapType(unit, innerdie);
-          if(auto diename = GetDieName(innerdie); diename != nullptr)
+          auto diename      = GetDieName(innerdie); 
+          if(diename != nullptr)
             funcptr = diename;
         }
       }
@@ -428,10 +435,10 @@ size_t DWARFParser::GetSourceMapType(llvm::DWARFUnit& unit, const DWARFDie& die)
 
         if(auto innertype = child.find(DW_AT_type))
           if(DWARFDie innerdie = AsReferencedDIE(innertype.getValue(), unit))
-            if(auto diename = GetDieName(innerdie); diename != nullptr)
+            if(auto diename = GetDieName(innerdie))
               funcptr += diename;
 
-        if(auto diename = GetDieName(child); diename != nullptr)
+        if(auto diename = GetDieName(child))
         {
           funcptr += ' ';
           funcptr += diename;
diff --git a/innative/filesys.h b/innative/filesys.h
@@ -33,6 +33,7 @@
 #endif
 
 #if INCLUDE_STD_FILESYSTEM_EXPERIMENTAL
+  #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
   #include <experimental/filesystem>
 using namespace std::experimental::filesystem;
 #else
diff --git a/pack-llvm.ps1 b/pack-llvm.ps1
@@ -1,4 +1,4 @@
-param([string]$llvm="llvm", [string]$arch="x64")
+param([string]$arch="x64")
 
 switch ($arch) {
   "x86-64" {$bin = "bin"}
@@ -7,14 +7,14 @@ switch ($arch) {
   "arm" {$bin = "bin-ARM"}
 }
 
-$target = "$llvm-9.0.0-$arch-windows"
+$target = "llvm-10.0.0-$arch-windows"
+New-Item -Force "$target\" -Type Directory
 New-Item -Force "$target\lib\" -Type Directory
 New-Item -Force "$target\include\" -Type Directory
 New-Item -Force "$target\bin\" -Type Directory
-robocopy "$bin\$llvm\include" "$target\include" *.h *.inc *.def *.td *.modulemap /S
-Copy-Item "$bin\$llvm\bin\*" -Destination "$target\bin\"
-Copy-Item "$bin\$llvm\MinSizeRel\bin\*" -Destination "$target\bin\"
-Copy-Item "$bin\$llvm\MinSizeRel\lib\*.lib" -Destination "$target\lib\" 
+robocopy "$bin\llvm\include" "$target\include" *.h *.inc *.def *.td *.modulemap /S
+Copy-Item "$bin\llvm\bin\*" -Destination "$target\bin\"
+Copy-Item "$bin\llvm\lib\*.lib" -Destination "$target\lib\"
 
 Compress-Archive -Force -Path $target -CompressionLevel Optimal -DestinationPath "$target.zip"
 Remove-Item $target -Recurse
diff --git a/pack-llvm.sh b/pack-llvm.sh
@@ -1,29 +1,25 @@
 #!/bin/sh
-PICK=lld
-if [ $# -eq 0 ]; then
-  PICK=llvm
-fi
-TARGET=$PICK-9.0.0-x86-64-posix
+TARGET=llvm-10.0.0-x86-64-posix
 
 mkdir -p $TARGET/bin
-mkdir -p $TARGET/include/$PICK
+mkdir -p $TARGET/include/llvm
 mkdir -p $TARGET/lib
-if [ "$PICK" = "llvm" ]; then
-cp bin/$PICK/lib/libLLVM*.a $TARGET/lib -f
-else
-cp bin/$PICK/lib/liblld*.a $TARGET/lib -f
-fi
+cp bin/llvm/lib/libLLVM*.a $TARGET/lib -f
+cp bin/llvm/lib/liblld*.a $TARGET/lib -f
 
-cp bin/$PICK/bin/* $TARGET/bin -f
-cd bin/llvm/include/$PICK/
-find ./ -type f \( -iname \*.h -o -iname \*.inc -o -iname \*.def -o -iname \*.td -o -iname \*.modulemap \) -exec cp --parents {} ../../../../$TARGET/include/$PICK/ -n \;
+cp bin/llvm/bin/* $TARGET/bin -f
+cd bin/llvm/include/llvm/
+find ./ -type f \( -iname \*.h -o -iname \*.inc -o -iname \*.def -o -iname \*.td -o -iname \*.modulemap \) -exec cp --parents {} ../../../../$TARGET/include/llvm/ -n \;
 cd ../../../../
-if [ "$PICK" = "llvm" ]; then
+
 mkdir -p $TARGET/include/llvm-c/
 cd bin/llvm/include/llvm-c/
 find ./ -type f \( -iname \*.h -o -iname \*.inc -o -iname \*.def -o -iname \*.td -o -iname \*.modulemap \) -exec cp --parents {} ../../../../$TARGET/include/llvm-c/ -n \;
 cd ../../../../
-fi
+
+cd bin/llvm/include/lld/
+find ./ -type f \( -iname \*.h -o -iname \*.inc -o -iname \*.def -o -iname \*.td -o -iname \*.modulemap \) -exec cp --parents {} ../../../../$TARGET/include/lld/ -n \;
+cd ../../../../
 
 tar -czf $TARGET.tar.gz $TARGET/
 rm -r $TARGET/
diff --git a/wasm-sourcemap.py b/wasm-sourcemap.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$cmakever = "3.15.4"`
	`1`	`+$cmakever = "3.17.1"`
`2`	`2`
`3`	`3`	`# If we can't find CMake, download it`
`4`	`4`	`if(!(Test-Path "./cmake/bin/cmake.exe" -PathType Leaf))`