Merge pull request #12 from MoonCollider/clean-upstream-sync

Sync with upstream
MoonCollider · Oct 6, 2023 · 95b705f · 95b705f
2 parents 79c750e + a1916ef
commit 95b705f
Show file tree

Hide file tree

Showing 56 changed files with 5,997 additions and 2,602 deletions.
diff --git a/.github/workflows/llvm-win.yml b/.github/workflows/llvm-win.yml
@@ -9,8 +9,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: windows-2022, platform: x86, vs: 2022 }
-          - { os: windows-2022, platform: x64, vs: 2022 }
+          - { os: windows-2022, platform: x86, vs: "Program Files/Microsoft Visual Studio/2022" }
+          - { os: windows-2022, platform: x64, vs: "Program Files/Microsoft Visual Studio/2022" }
 
     runs-on: ${{ matrix.config.os }}
 
@@ -35,7 +35,7 @@ jobs:
       - name: Environment
         shell: cmd
         run: |
-          call "C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
+          call "C:\%VS_VERSION%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
           :: Loop over all environment variables and make them global using set-env.
           :: See: https://stackoverflow.com/a/39184941
           setlocal

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,15 +9,16 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-20.04, platform: x64, cxx: g++-10, cc: gcc-10 }
+          - { os: ubuntu-22.04, platform: x64, cxx: g++-11, cc: gcc-11 }
           - { os: macos-11, platform: x64, cxx: clang++, cc: clang }
-          - { os: windows-2019, platform: x64, vs: msvc }
+          - { os: windows-2022, platform: x64, vs: "Program Files/Microsoft Visual Studio/2022" }
 
     runs-on: ${{ matrix.config.os }}
 
     env:
       CC: ${{ matrix.config.cc }}
       CXX: ${{ matrix.config.cxx }}
+      VS_VERSION: ${{ matrix.config.vs }}
       PLATFORM: ${{ matrix.config.platform }}
       DOTNET_NOLOGO: true
       DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -38,7 +39,7 @@ jobs:
       - name: Environment
         if: matrix.config.vs
         shell: bash
-        run: echo "/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin" >> $GITHUB_PATH
+        run: echo "/c/$VS_VERSION/Enterprise/MSBuild/Current/Bin" >> $GITHUB_PATH
 
       - name: Setup
         shell: bash

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -52,7 +52,6 @@
   </PropertyGroup>
 
   <Target Name="prepack" DependsOnTargets="Build" Condition="'$(IsPackable)' == 'true' AND '$(Platform)' == 'x64'">
-    <Copy SourceFiles="$(TargetDir)ref\$(TargetFileName)" DestinationFolder="$(PackageDir)ref\$(GlobalTargetFramework)" Condition="'$(ProduceReferenceAssembly)' == 'true' AND '$(RID)' == 'win-x64'" />
     <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(PackageDir)runtimes\$(RID)\lib\$(GlobalTargetFramework)" />
   </Target>
 </Project>
diff --git a/README.md b/README.md
@@ -85,6 +85,8 @@ Alternatively, you may post bounties at https://www.bountysource.com/.
 
 CppSharp is used by the following projects:
 
+[Kythera AI](https://kythera.ai)
+
 [QtSharp](https://gitlab.com/ddobrev/QtSharp)
 
 [MonoGame](https://github.com/mono/MonoGame)

diff --git a/build/Helpers.lua b/build/Helpers.lua
@@ -73,7 +73,8 @@ end
 
 local function target_framework()
   local value =  _OPTIONS["target-framework"]
-  return string.isempty(value) and "net6.0" or value
+  local default_framework = _ACTION <= "vs2019" and "net5.0" or "net6.0"
+  return string.isempty(value) and default_framework or value
 end
 
 targetframework = target_framework()

diff --git a/build/LLVM.lua b/build/LLVM.lua
@@ -42,6 +42,7 @@ function SetupLLVMIncludes()
       includedirs
       {
         path.join(LLVMRootDirDebug, "include"),
+        path.join(LLVMRootDirDebug, "llvm/include"),
         path.join(LLVMRootDirDebug, "lld/include"),
         path.join(LLVMRootDirDebug, "clang/include"),
         path.join(LLVMRootDirDebug, "clang/lib"),
@@ -53,6 +54,7 @@ function SetupLLVMIncludes()
       includedirs
       {
         path.join(LLVMRootDirRelease, "include"),
+        path.join(LLVMRootDirRelease, "llvm/include"),
         path.join(LLVMRootDirRelease, "lld/include"),
         path.join(LLVMRootDirRelease, "clang/include"),
         path.join(LLVMRootDirRelease, "clang/lib"),
@@ -64,6 +66,7 @@ function SetupLLVMIncludes()
     includedirs
     {
       path.join(LLVMRootDir, "include"),
+      path.join(LLVMRootDir, "llvm/include"),
       path.join(LLVMRootDir, "lld/include"),
       path.join(LLVMRootDir, "clang/include"),
       path.join(LLVMRootDir, "clang/lib"),
@@ -144,18 +147,22 @@ function SetupLLVMLibs()
       "clangCodeGen",
       "clangParse",
       "clangSema",
+      "clangSupport",
       "clangAnalysis",
       "clangEdit",
       "clangAST",
       "clangLex",
       "clangBasic",
       "clangIndex",
+      "clangASTMatchers",
+      "LLVMWindowsDriver",
       "LLVMWindowsManifest",
       "LLVMDebugInfoPDB",
       "LLVMLTO",
       "LLVMPasses",
       "LLVMObjCARCOpts",
       "LLVMLibDriver",
+      "LLVMFrontendHLSL",
       "LLVMFrontendOpenMP",
       "LLVMOption",
       "LLVMCoverage",
@@ -170,6 +177,7 @@ function SetupLLVMLibs()
       "LLVMVectorize",
       "LLVMLinker",
       "LLVMIRReader",
+      "LLVMIRPrinter",
       "LLVMAsmParser",
       "LLVMMCDisassembler",
       "LLVMCFGuard",
@@ -178,7 +186,9 @@ function SetupLLVMLibs()
       "LLVMAsmPrinter",
       "LLVMDebugInfoDWARF",
       "LLVMCodeGen",
+      "LLVMCodeGenTypes",
       "LLVMTarget",
+      "LLVMTargetParser",
       "LLVMScalarOpts",
       "LLVMInstCombine",
       "LLVMAggressiveInstCombine",
@@ -202,7 +212,8 @@ function SetupLLVMLibs()
       "lldCommon",
       "lldCOFF",
       "lldELF",
-      "lldMachO"
+      "lldMachO",
+      "lldMinGW"
     }
 
   filter(c)

diff --git a/build/build.sh b/build/build.sh
@@ -2,7 +2,7 @@
 set -e
 builddir=$(cd "$(dirname "$0")"; pwd)
 platform=x64
-vs=vs2019
+vs=vs2022
 configuration=Release
 build_only=false
 ci=false
@@ -104,18 +104,26 @@ download_premake()
 {
   premake_dir="$builddir/premake"
   premake_filename=premake5
+  premake_archive_ext=tar.gz
   if [ $oshost = "windows" ]; then
     premake_filename=$premake_filename.exe
+    premake_archive_ext=zip
   fi
   premake_path=$premake_dir/$premake_filename
 
   if ! [ -f "$premake_path" ]; then
     echo "Downloading and unpacking Premake..."
-    premake_url=https://github.com/InteropAlliance/premake-core/releases/download/latest/premake-$oshost-$platform.zip  
+    premake_version=5.0.0-beta2
+    premake_archive=premake-$premake_version-$oshost.$premake_archive_ext
+    premake_url=https://github.com/premake/premake-core/releases/download/v$premake_version/$premake_archive
     curl -L -O $premake_url
-    unzip premake-$oshost-$platform.zip $premake_filename -d "$premake_dir"
+    if [ $oshost = "windows" ]; then
+      unzip $premake_archive $premake_filename -d "$premake_dir"
+    else
+      tar -xf $premake_archive -C "$premake_dir" ./$premake_filename
+    fi
     chmod +x "$premake_path"
-    rm premake-$oshost-$platform.zip
+    rm $premake_archive
   fi
 }
 

diff --git a/build/llvm/LLVM-commit b/build/llvm/LLVM-commit
@@ -1 +1 @@
-791523bae6153b13bb41ba05c9fc89e502cc4a1a
+6eb36aed86ea276695697093eb8136554c29286b
diff --git a/build/llvm/LLVM.lua b/build/llvm/LLVM.lua
@@ -251,6 +251,7 @@ function cmake(gen, conf, builddir, options)
 		.. ' -DLLVM_ENABLE_LIBXML2=false'
 		.. ' -DLLVM_ENABLE_TERMINFO=false'
 		.. ' -DLLVM_ENABLE_ZLIB=false'
+		.. ' -DLLVM_ENABLE_ZSTD=false'
 		.. ' -DLLVM_INCLUDE_DOCS=false'
 		.. ' -DLLVM_INCLUDE_EXAMPLES=false'
 		.. ' -DLLVM_TARGETS_TO_BUILD="X86"'
@@ -370,6 +371,8 @@ function cmake(gen, conf, builddir, options)
 		.. ' -DCLANG_TOOL_CLANG_FUZZER_BUILD=false'
 		.. ' -DCLANG_TOOL_CLANG_IMPORT_TEST_BUILD=false'
 		.. ' -DCLANG_TOOL_CLANG_NVLINK_WRAPPER_BUILD=false'
+		.. ' -DCLANG_TOOL_CLANG_LINKER_WRAPPER_BUILD=false'
+		.. ' -DCLANG_TOOL_CLANG_OFFLOAD_PACKAGER_BUILD=false'
 		.. ' -DCLANG_TOOL_CLANG_OFFLOAD_BUNDLER_BUILD=false'
 		.. ' -DCLANG_TOOL_CLANG_OFFLOAD_WRAPPER_BUILD=false'
 		.. ' -DCLANG_TOOL_CLANG_REFACTOR_BUILD=false'
@@ -456,7 +459,7 @@ function package_llvm(conf, llvm_base, llvm_build)
 	if os.isdir(out) then os.rmdir(out)	end
 	os.mkdir(out)
 
-	os.copydir(llvm_base .. "/llvm/include", out .. "/include")
+	os.copydir(llvm_base .. "/llvm/include", out .. "/llvm/include")
 	os.copydir(llvm_base .. "/lld/include", out .. "/lld/include")
 	os.copydir(llvm_build .. "/include", out .. "/build/include")
 
@@ -483,12 +486,10 @@ function package_llvm(conf, llvm_base, llvm_build)
 	local out_lib_dir = out .. "/build/lib"
 	if os.ishost("windows") then
 		os.rmfiles(out_lib_dir, "clang*ARC*.lib")
-		os.rmfiles(out_lib_dir, "clang*Matchers*.lib")
 		os.rmfiles(out_lib_dir, "clang*Rewrite*.lib")
 		os.rmfiles(out_lib_dir, "clang*StaticAnalyzer*.lib")
 	else
 		os.rmfiles(out_lib_dir, "libclang*ARC*.a")
-		os.rmfiles(out_lib_dir, "libclang*Matchers*.a")
 		os.rmfiles(out_lib_dir, "libclang*Rewrite*.a")
 		os.rmfiles(out_lib_dir, "libclang*StaticAnalyzer*.a")
 	end

diff --git a/src/AST/Method.cs b/src/AST/Method.cs
@@ -94,10 +94,12 @@ public Method(Method method)
         {
             Access = method.Access;
             IsVirtual = method.IsVirtual;
+            IsStatic = method.IsStatic;
             IsConst = method.IsConst;
+            IsExplicit = method.IsExplicit;
+            IsVolatile = method.IsVolatile;
             IsFinal = method.IsFinal;
             IsProxy = method.IsProxy;
-            IsStatic = method.IsStatic;
             Kind = method.Kind;
             IsDefaultConstructor = method.IsDefaultConstructor;
             IsCopyConstructor = method.IsCopyConstructor;
@@ -119,6 +121,7 @@ public Method(Function function)
         public bool IsStatic { get; set; }
         public bool IsConst { get; set; }
         public bool IsExplicit { get; set; }
+        public bool IsVolatile { get; set; }
 
         public bool IsOverride
         {

diff --git a/src/Core/Toolchains/MSVCToolchain.cs b/src/Core/Toolchains/MSVCToolchain.cs
@@ -16,6 +16,7 @@ public enum VisualStudioVersion
         VS2015 = 14,
         VS2017 = 15,
         VS2019 = 16,
+        VS2022 = 17,
         Latest,
     }
 
@@ -67,9 +68,12 @@ public static Version GetCLVersion(VisualStudioVersion vsVersion)
                     clVersion = new Version { Major = 19, Minor = 10 };
                     break;
                 case VisualStudioVersion.VS2019:
-                case VisualStudioVersion.Latest:
                     clVersion = new Version { Major = 19, Minor = 20 };
                     break;
+                case VisualStudioVersion.VS2022:
+                case VisualStudioVersion.Latest:
+                    clVersion = new Version { Major = 19, Minor = 30 };
+                    break;
                 default:
                     throw new Exception("Unknown Visual Studio version");
             }

diff --git a/src/CppParser/AST.cpp b/src/CppParser/AST.cpp
@@ -674,6 +674,7 @@ Method::Method()
     , isStatic(false)
     , isConst(false)
     , isExplicit(false)
+    , isVolatile(false)
     , isDefaultConstructor(false)
     , isCopyConstructor(false)
     , isMoveConstructor(false)
@@ -1078,6 +1079,8 @@ HTMLStartTagComment::Attribute::Attribute() {}
 
 HTMLStartTagComment::Attribute::Attribute(const Attribute& rhs) : name(rhs.name), value(rhs.value) {}
 
+HTMLStartTagComment::Attribute::~Attribute() {}
+
 HTMLStartTagComment::HTMLStartTagComment() : HTMLTagComment(CommentKind::HTMLStartTagComment) {}
 
 DEF_VECTOR(HTMLStartTagComment, HTMLStartTagComment::Attribute, Attributes)

diff --git a/src/CppParser/AST.h b/src/CppParser/AST.h
@@ -201,6 +201,7 @@ class CS_API HTMLStartTagComment : public HTMLTagComment
     public:
         Attribute();
         Attribute(const Attribute&);
+        ~Attribute();
         std::string name;
         std::string value;
     };