Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,33 @@ jobs:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest

- run: df -h

- name: Free Disk Space
if: startsWith(matrix.os, 'ubuntu')
uses: endersonmenezes/free-disk-space@v2
with:
remove_android: true
remove_dotnet: true
remove_haskell: true
remove_tool_cache: true
remove_swap: true
remove_packages: "azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox postgresql* temurin-* *llvm* mysql* dotnet-sdk-*"
remove_packages_one_command: true
remove_folders: "/usr/share/swift /usr/share/miniconda /usr/share/az* /usr/local/lib/node_modules /usr/local/share/chromium /usr/local/share/powershell /usr/local/julia /usr/local/aws-cli /usr/local/aws-sam-cli /usr/share/gradle"
testing: false

- name: Free Disk Space
if: startsWith(matrix.os, 'macos')
run: |
sudo rm -rf /Library/Frameworks/Mono.framework
sudo rm -rf /Library/Frameworks/Xamarin.iOS.framework
sudo rm -rf /Library/Frameworks/Xamarin.Android.framework
sudo rm -rf /Users/runner/Library/Android
sudo rm -rf /usr/local/share/powershell
sudo find /Applications -type d -name "Xcode_*.app" ! -name "Xcode_$XCODE_VERSION.app" -prune -exec rm -rf "{}" \;
- run: df -h

- name: Install cross compilers
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.platform, 'arm64')
run: sudo apt install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,30 @@ jobs:
with:
fetch-depth: 0

- name: Free Disk Space
if: startsWith(matrix.os, 'ubuntu')
uses: endersonmenezes/free-disk-space@v2
with:
remove_android: true
remove_haskell: true
remove_tool_cache: true
remove_swap: true
remove_packages: "azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox postgresql* temurin-* *llvm* mysql* dotnet-sdk-*"
remove_packages_one_command: true
remove_folders: "/usr/share/swift /usr/share/miniconda /usr/share/az* /usr/local/lib/node_modules /usr/local/share/chromium /usr/local/share/powershell /usr/local/julia /usr/local/aws-cli /usr/local/aws-sam-cli /usr/share/gradle"
testing: false

- name: Free Disk Space
if: startsWith(matrix.os, 'macos')
run: |
sudo rm -rf /Library/Frameworks/Mono.framework
sudo rm -rf /Library/Frameworks/Xamarin.iOS.framework
sudo rm -rf /Library/Frameworks/Xamarin.Android.framework
sudo rm -rf /Users/runner/Library/Android
sudo rm -rf /usr/local/share/powershell
sudo find /Applications -type d -name "Xcode_*.app" ! -name "Xcode_$XCODE_VERSION.app" -prune -exec rm -rf "{}" \;
- run: df -h

- name: Setup emsdk
uses: pyodide/setup-emsdk@v15
with:
Expand Down
7 changes: 6 additions & 1 deletion build/LLVM.lua
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ function SetupLLVMLibs()

filter { "toolset:msc*" }
links { "version" }

links { "ntdll"}

filter {}

if LLVMDirPerConfiguration then
Expand All @@ -164,6 +165,7 @@ function SetupLLVMLibs()

links
{
"clangAPINotes",
"clangFrontend",
"clangDriver",
"clangSerialization",
Expand All @@ -185,8 +187,10 @@ function SetupLLVMLibs()
"LLVMPasses",
"LLVMObjCARCOpts",
"LLVMLibDriver",
"LLVMFrontendOffloading",
"LLVMFrontendHLSL",
"LLVMFrontendOpenMP",
"LLVMHipStdPar",
"LLVMOption",
"LLVMCoverage",
"LLVMCoroutines",
Expand All @@ -201,6 +205,7 @@ function SetupLLVMLibs()
"LLVMAArch64Disassembler",
"LLVMAArch64Info",
"LLVMAArch64Utils",
"LLVMFrontendDriver",
"LLVMipo",
"LLVMInstrumentation",
"LLVMVectorize",
Expand Down
2 changes: 1 addition & 1 deletion build/llvm/LLVM-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6eb36aed86ea276695697093eb8136554c29286b
cd708029e0b2869e80abe31ddb175f7c35361f90
6 changes: 4 additions & 2 deletions build/llvm/LLVM.lua
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ function cmake(gen, conf, builddir, options)
.. ' -DLLVM_INCLUDE_TESTS=false'
.. ' -DLLVM_ENABLE_LIBEDIT=false'
.. ' -DLLVM_ENABLE_LIBXML2=false'
.. ' -DLLVM_ENABLE_MLGO=false'
.. ' -DLLVM_ENABLE_TERMINFO=false'
.. ' -DLLVM_ENABLE_ZLIB=false'
.. ' -DLLVM_ENABLE_ZSTD=false'
Expand Down Expand Up @@ -326,7 +327,7 @@ function cmake(gen, conf, builddir, options)
.. ' -DLLVM_TOOL_LLVM_MODEXTRACT_BUILD=false'
.. ' -DLLVM_TOOL_LLVM_MT_BUILD=false'
.. ' -DLLVM_TOOL_LLVM_NM_BUILD=false'
.. ' -DLLVM_TOOL_LLVM_OBJCOPY_BUILD=false'
.. ' -DLLVM_TOOL_LLVM_OBJCOPY_BUILD=true'
.. ' -DLLVM_TOOL_LLVM_OBJDUMP_BUILD=false'
.. ' -DLLVM_TOOL_LLVM_OPT_FUZZER_BUILD=false'
.. ' -DLLVM_TOOL_LLVM_OPT_REPORT_BUILD=false'
Expand Down Expand Up @@ -366,7 +367,8 @@ function cmake(gen, conf, builddir, options)
.. ' -DLLVM_TOOL_VERIFY_USELISTORDER_BUILD=false'
.. ' -DLLVM_TOOL_VFABI_DEMANGLE_FUZZER_BUILD=false'
.. ' -DLLVM_TOOL_XCODE_TOOLCHAIN_BUILD=false'
.. ' -DLLVM_TOOL_YAML2OBJ_BUILD=false'
.. ' -DLLVM_TOOL_YAML2OBJ_BUILD=true'
.. ' -DLLVM_TOOL_LLVM_OBJCOPY_BUILD=true'
.. ' -DLLVM_HAVE_LIBXAR=false'
.. ' -DCLANG_BUILD_EXAMPLES=false '
.. ' -DCLANG_BUILD_TOOLS=false'
Expand Down
8 changes: 6 additions & 2 deletions src/CppParser/ASTNameMangler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,18 @@ std::string ASTNameMangler::GetMangledStructor(const NamedDecl* ND, unsigned Str
return FrontendBuf;
}

std::string ASTNameMangler::GetMangledThunk(const CXXMethodDecl* MD, const ThunkInfo& T, bool /*ElideOverrideInfo*/) const
std::string ASTNameMangler::GetMangledThunk(const CXXMethodDecl* MD, const ThunkInfo& T, bool ElideOverrideInfo) const
{
std::string FrontendBuf;
llvm::raw_string_ostream FOS(FrontendBuf);

// TODO: Enable `ElideOverrideInfo` param if clang is updated to 19
MC->mangleThunk(MD, T, /*ElideOverrideInfo,*/ FOS);

#if LLVM_VERSION_MAJOR >= 19
MC->mangleThunk(MD, T, ElideOverrideInfo, FOS);
#else
MC->mangleThunk(MD, T, FOS);
#endif
return FrontendBuf;
}

Expand Down
Loading