-
Notifications
You must be signed in to change notification settings - Fork 30
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.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade CppInterOp to support llvm 20 #491
Open
mcbarton
wants to merge
13
commits into
compiler-research:main
Choose a base branch
from
mcbarton:Update-to-llvm-20
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
391be18
Upgrade to support llvm 20
mcbarton 9df8277
Update emscripten.yml
mcbarton 9c64f35
Merge branch 'main' into Update-to-llvm-20
mcbarton 889f996
Part of upgrade to llvm 20
mcbarton fce2b83
Merge branch 'main' into Update-to-llvm-20
mcbarton ba99ace
See if CUDA tests still broken llvm 20
mcbarton 8c6e593
Revert "See if CUDA tests still broken llvm 20"
mcbarton 8a4c0af
Merge branch 'main' into Update-to-llvm-20
mcbarton a38a66e
Merge branch 'main' into Update-to-llvm-20
mcbarton 641da6a
Revert changes to CudaTests to show error message in ci run
mcbarton a3111e0
Merge branch 'main' into Update-to-llvm-20
mcbarton 13c69a5
Add llvm 20 Emscripten jobs
mcbarton 6e1a9ff
Remove Windows 19 job
mcbarton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -174,12 +174,29 @@ void CopyIncludePaths(const clang::HeaderSearchOptions& Opts, | |
| if (!withSystem) continue; | ||
| if (withFlags) incpaths.push_back("-isystem"); | ||
| break; | ||
|
|
||
| // Option was removed in llvm 20. Git log message below. | ||
| // git log --grep="index-header" | ||
| // commit 19b4f17d4c0ae12725050d09f04f85bccc686d8e | ||
| // Author: Jan Svoboda <[email protected]> | ||
| // Date: Thu Oct 31 16:04:35 2024 -0700 | ||
| // | ||
| // [clang][lex] Remove `-index-header-map` (#114459) | ||
| // | ||
| // This PR removes the `-index-header-map` functionality from Clang. | ||
| // AFAIK this was only used internally at Apple and is now dead code. | ||
| // The main motivation behind this change is to enable the removal of | ||
| // `HeaderFileInfo::Framework` member and reducing the size of that | ||
| // data structure. | ||
| // | ||
| // rdar://84036149 | ||
|
|
||
| #if CLANG_VERSION_MAJOR < 20 | ||
| case frontend::IndexHeaderMap: | ||
| if (!withSystem) continue; | ||
| if (withFlags) incpaths.push_back("-index-header-map"); | ||
| if (withFlags) incpaths.push_back(E.IsFramework? "-F" : "-I"); | ||
| break; | ||
| #endif | ||
|
|
||
| case frontend::CSystem: | ||
| if (!withSystem) continue; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake | ||
| index 6af47b51d4c6..c635e7f5be9e 100644 | ||
| --- a/llvm/cmake/modules/CrossCompile.cmake | ||
| +++ b/llvm/cmake/modules/CrossCompile.cmake | ||
| @@ -70,8 +70,8 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) | ||
| add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt | ||
| COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" | ||
| -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}" | ||
| - -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}" | ||
| - -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}" | ||
| + -DCMAKE_C_COMPILER="clang" | ||
| + -DCMAKE_CXX_COMPILER="clang++" | ||
| ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ${CROSS_TOOLCHAIN_FLAGS_${project_name}_${target_name}} | ||
| -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE | ||
|
|
15 changes: 15 additions & 0 deletions
15
patches/llvm/emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/clang/lib/Interpreter/Wasm.cpp b/clang/lib/Interpreter/Wasm.cpp | ||
| index aa10b160ccf8..184867e2b55f 100644 | ||
| --- a/clang/lib/Interpreter/Wasm.cpp | ||
| +++ b/clang/lib/Interpreter/Wasm.cpp | ||
| @@ -76,8 +76,8 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) { | ||
| llvm::TargetMachine *TargetMachine = Target->createTargetMachine( | ||
| PTU.TheModule->getTargetTriple(), "", "", TO, llvm::Reloc::Model::PIC_); | ||
| PTU.TheModule->setDataLayout(TargetMachine->createDataLayout()); | ||
| - std::string ObjectFileName = PTU.TheModule->getName().str() + ".o"; | ||
| - std::string BinaryFileName = PTU.TheModule->getName().str() + ".wasm"; | ||
| + std::string ObjectFileName = "/tmp/" + PTU.TheModule->getName().str() + ".o"; | ||
| + std::string BinaryFileName = "/tmp/" + PTU.TheModule->getName().str() + ".wasm"; | ||
|
|
||
| std::error_code Error; | ||
| llvm::raw_fd_ostream ObjectFileOutput(llvm::StringRef(ObjectFileName), Error); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: no header providing "CLANG_VERSION_MAJOR" is directly included [misc-include-cleaner]
lib/Interpreter/Paths.cpp:20:
+ #include <clang/Basic/Version.h>