Skip to content

Stop shipping LLVMSupport and LLVMDemangle in the release packages #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ASDAlexander77 merged 2 commits into from
Sep 25, 2026
Merged

Stop shipping LLVMSupport and LLVMDemangle in the release packages #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1ee83
Stop shipping LLVMSupport and LLVMDemangle in the release packages
ASDAlexander77 Sep 25, 2026
7fd8380
Stop passing the LLVM lib path into the project templates
ASDAlexander77 Sep 25, 2026
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
8 changes: 3 additions & 5 deletions .github/workflows/create-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ jobs:
GC_SHARED_LIB_PATH: ${{github.workspace}}/3rdParty/gcdll/x64/release/lib
LLVM_LIB_PATH: ${{github.workspace}}/3rdParty/llvm/x64/release/lib
TSLANG_LIB_PATH: ${{github.workspace}}/__build/tslang/msbuild/x64/release/lib
# This package ships only release-CRT (/MT) builds of TypeScriptAsyncRuntime.lib, gc.lib
# and LLVMSupport.lib, so the debug archive has to be /MT too or a `--di` program cannot
# This package ships only release-CRT (/MT) builds of TypeScriptAsyncRuntime.lib and
# gc.lib, so the debug archive has to be /MT too or a `--di` program cannot
# link with them (LNK2038). It keeps its debug info. See DefaultLib's build_core.bat.
TSLANG_DEBUG_CRT: /MT
run: |
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
run: |
New-Item -ItemType Directory -Force -Path .\gcdll_stage\gcdll | Out-Null
Copy-Item -Path ..\3rdParty\gcdll\x64\release\lib\gc.lib, ..\3rdParty\gcdll\x64\release\bin\gc.dll -Destination .\gcdll_stage\gcdll -ErrorAction Stop
Get-ChildItem -Path .\tslang\msbuild\x64\release\bin\tslang.exe, .\tslang\msbuild\x64\release\bin\TypeScriptRuntime.dll, .\tslang\msbuild\x64\release\bin\gc.dll, .\gc\msbuild\x64\release\${{ env.BUILD_TYPE }}\gc.lib, .\tslang\msbuild\x64\release\lib\TypeScriptAsyncRuntime.lib, ..\3rdParty\llvm\x64\release\lib\LLVMSupport.lib, ..\3rdParty\llvm\x64\release\bin\wasm-ld.exe, ..\TypeScriptCompilerDefaultLib\__build, .\gcdll_stage | Compress-Archive -DestinationPath ..\${{ env.ASSET_NAME }}-windows-x64.zip
Get-ChildItem -Path .\tslang\msbuild\x64\release\bin\tslang.exe, .\tslang\msbuild\x64\release\bin\TypeScriptRuntime.dll, .\tslang\msbuild\x64\release\bin\gc.dll, .\gc\msbuild\x64\release\${{ env.BUILD_TYPE }}\gc.lib, .\tslang\msbuild\x64\release\lib\TypeScriptAsyncRuntime.lib, ..\3rdParty\llvm\x64\release\bin\wasm-ld.exe, ..\TypeScriptCompilerDefaultLib\__build, .\gcdll_stage | Compress-Archive -DestinationPath ..\${{ env.ASSET_NAME }}-windows-x64.zip
shell: pwsh

- name: Archive Zip of Windows Asset
Expand Down Expand Up @@ -435,8 +435,6 @@ jobs:
cp ./gc/ninja/release/libgc.a ./__stage/
cp ./tslang/ninja/release/lib/libTypeScriptAsyncRuntime.a ./__stage/
cp ../3rdParty/llvm/release/bin/wasm-ld ./__stage/
cp ../3rdParty/llvm/release/lib/libLLVMSupport.a ./__stage/
cp ../3rdParty/llvm/release/lib/libLLVMDemangle.a ./__stage/
# Add the default library as a whole tree so its per-build, per-memory-model
# subfolders are preserved: defaultlib/{dll,lib}/{debug,release}/{gc,rc,none},
# defaultlib/*.d.ts, defaultlib/generics/
Expand Down
5 changes: 2 additions & 3 deletions scripts/measure_memory_model.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,12 @@ public static class PeakWs {
$bin = "I:/TypeScriptCompiler/__build/tslang/windows-msbuild-2026-release/bin"
$lib = "I:/TypeScriptCompiler/__build/tslang/windows-msbuild-2026-release/lib"
$lld = "I:/TypeScriptCompiler/tslang/../3rdParty/llvm/x64/release/bin"
$llvmlib = "I:/TypeScriptCompiler/tslang/../3rdParty/llvm/x64/release/lib"
$gclib = "I:/TypeScriptCompiler/3rdParty/gc/x64/release/lib"
$vclib = "C:/Program Files/Microsoft Visual Studio/18/Professional/VC/Tools/MSVC/14.51.36231/lib/x64"
$sdk = "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.28000.0/um/x64"
$ucrt = "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.28000.0/ucrt/x64"

$libs = "libcmt.lib libvcruntime.lib libucrt.lib ntdll.lib TypeScriptAsyncRuntime.lib gc.lib LLVMSupport.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib"
$libs = "libcmt.lib libvcruntime.lib libucrt.lib ntdll.lib TypeScriptAsyncRuntime.lib gc.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib"

$stem = [System.IO.Path]::GetFileNameWithoutExtension($Source)
$work = Join-Path $env:TEMP "measure-$stem"
Expand All @@ -84,7 +83,7 @@ foreach ($m in $Models) {
}

$link = & "$lld/lld.exe" -flavor link $objs "/out:$exe" $libs.Split(' ') `
"/libpath:$gclib" "/libpath:$llvmlib" "/libpath:$lib" "/libpath:$vclib" "/libpath:$sdk" "/libpath:$ucrt" 2>&1
"/libpath:$gclib" "/libpath:$lib" "/libpath:$vclib" "/libpath:$sdk" "/libpath:$ucrt" 2>&1
if ($LASTEXITCODE -ne 0) { "{0,-5} LINK FAILED ({1})" -f $m, $LASTEXITCODE; $link | Select-Object -Last 3; continue }

$p = Start-Process -FilePath $exe -PassThru -NoNewWindow -RedirectStandardOutput "$work\$stem-$m.out" -RedirectStandardError "$work\$stem-$m.err"
Expand Down
6 changes: 0 additions & 6 deletions tslang/include/TypeScript/VSCodeTemplate/Files.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ const auto TASKS_JSON_DATA = R"raw(
"type": "shell",
"args": [
"--gc-lib-path=<<GC_LIB_PATH>>",
"--llvm-lib-path=<<LLVM_LIB_PATH>>",
"--tslang-lib-path=<<TSLANG_LIB_PATH>>",
"--default-lib-path=<<DEFAULT_LIB_PATH>>",
"--di",
Expand All @@ -104,7 +103,6 @@ const auto TASKS_JSON_DATA = R"raw(
"type": "shell",
"args": [
"--gc-lib-path=<<GC_LIB_PATH>>",
"--llvm-lib-path=<<LLVM_LIB_PATH>>",
"--tslang-lib-path=<<TSLANG_LIB_PATH>>",
"--default-lib-path=<<DEFAULT_LIB_PATH>>",
"--opt",
Expand All @@ -127,7 +125,6 @@ const auto TASKS_JSON_DATA = R"raw(
"type": "shell",
"args": [
"--gc-lib-path=<<GC_LIB_PATH>>",
"--llvm-lib-path=<<LLVM_LIB_PATH>>",
"--tslang-lib-path=<<TSLANG_LIB_PATH>>",
"--default-lib-path=<<DEFAULT_LIB_PATH>>",
"--di",
Expand All @@ -150,7 +147,6 @@ const auto TASKS_JSON_DATA = R"raw(
"type": "shell",
"args": [
"--gc-lib-path=<<GC_LIB_PATH>>",
"--llvm-lib-path=<<LLVM_LIB_PATH>>",
"--tslang-lib-path=<<TSLANG_LIB_PATH>>",
"--default-lib-path=<<DEFAULT_LIB_PATH>>",
"--opt",
Expand Down Expand Up @@ -216,7 +212,6 @@ const auto LAUNCH_JSON_DATA_WIN32 = R"raw(
"args": [
"--shared-libs=<<TSLANG_LIB_PATH>>\\TypeScriptRuntime.dll",
"--gc-lib-path=<<GC_LIB_PATH>>",
"--llvm-lib-path=<<LLVM_LIB_PATH>>",
"--tslang-lib-path=<<TSLANG_LIB_PATH>>",
"--default-lib-path=<<DEFAULT_LIB_PATH>>",
"--no-default-lib",
Expand Down Expand Up @@ -278,7 +273,6 @@ const auto LAUNCH_JSON_DATA_LINUX = R"raw(
"args": [
"--shared-libs=<<TSLANG_LIB_PATH>>/libTypeScriptRuntime.so",
"--gc-lib-path=<<GC_LIB_PATH>>",
"--llvm-lib-path=<<LLVM_LIB_PATH>>",
"--tslang-lib-path=<<TSLANG_LIB_PATH>>",
"--default-lib-path=<<DEFAULT_LIB_PATH>>",
"--opt",
Expand Down
3 changes: 0 additions & 3 deletions tslang/tslang/cmake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ int substitute(StringRef data, StringMap<StringRef> &values, SmallString<128> &r
string getExecutablePath(const char *);
string fixpath(string, const SmallVectorImpl<char>&);
string getGCLibPath();
string getLLVMLibPath();
string getTslangLibPath();
string getDefaultLibPath();

Expand Down Expand Up @@ -66,15 +65,13 @@ int createCMakeFolder(int argc, char **argv)

auto tslangCmd = fixpath(driverPath, appPath);
auto gcLibPath = fixpath(getGCLibPath(), appPath);
auto llvmLibPath = fixpath(getLLVMLibPath(), appPath);
auto tslangLibPath = fixpath(getTslangLibPath(), appPath);
auto defaultLibPath = fixpath(getDefaultLibPath(), appPath);
// hint for finding tslang app (same logic as in createVSCodeFolder)
auto tslangAppPath = fixpath(string(appPath.begin(), appPath.end()), appPath);

vals["TSLANG_CMD"] = tslangCmd;
vals["GC_LIB_PATH"] = gcLibPath;
vals["LLVM_LIB_PATH"] = llvmLibPath;
vals["TSLANG_LIB_PATH"] = tslangLibPath;
vals["DEFAULT_LIB_PATH"] = defaultLibPath;
vals["TSLANG_APP_PATH"] = tslangAppPath;
Expand Down
3 changes: 0 additions & 3 deletions tslang/tslang/vscode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ int substitute(StringRef data, StringMap<StringRef> &values, SmallString<128> &r

string getExecutablePath(const char *);
string getGCLibPath();
string getLLVMLibPath();
string getTslangLibPath();
string getDefaultLibPath();
string fixpath(string, const SmallVectorImpl<char>&);
Expand Down Expand Up @@ -84,15 +83,13 @@ int createVSCodeFolder(int argc, char **argv)

auto tslangCmd = fixpath(driverPath, appPath);
auto gcLibPath = fixpath(getGCLibPath(), appPath);
auto llvmLibPath = fixpath(getLLVMLibPath(), appPath);
auto tslangLibPath = fixpath(getTslangLibPath(), appPath);
auto defaultLibPath = fixpath(getDefaultLibPath(), appPath);
// hint for finding tslang app (same logic as in createVSCodeFolder)
auto tslangAppPath = fixpath(string(appPath.begin(), appPath.end()), appPath);

vals["TSLANG_CMD"] = tslangCmd;
vals["GC_LIB_PATH"] = gcLibPath;
vals["LLVM_LIB_PATH"] = llvmLibPath;
vals["TSLANG_LIB_PATH"] = tslangLibPath;
vals["DEFAULT_LIB_PATH"] = defaultLibPath;
vals["TSLANG_APP_PATH"] = tslangAppPath;
Expand Down
Loading