- Notifications
You must be signed in to change notification settings - Fork14.5k
[Clang] Reintroduce obsolete libclang symbols to avoid an ABI break#149079
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
+65 −0
Conversation
This file contains hidden or 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
@llvm/pr-subscribers-clang Author: None (Sirraide) ChangesFor more context, see#119269 (comment), but briefly, when removing ARCMigrate, I also removed some symbols in libclang, which constitutes an ABI break that we don’t want, so this pr reintroduces the removed symbols; the declarations are marked as deprecated for future removal, and the implementations print an error and do nothing, which is what we used to do when ARCMigrate was disabled. Full diff:https://github.com/llvm/llvm-project/pull/149079.diff 4 Files Affected:
diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.hindex c35311c886413..b929585205aee 100644--- a/clang/include/clang-c/Index.h+++ b/clang/include/clang-c/Index.h@@ -6953,6 +6953,21 @@ clang_getCursorUnaryOperatorKind(CXCursor cursor); * @} */+CINDEX_DEPRECATED+typedef void *CXRemapping;++CINDEX_DEPRECATED CINDEX_LINKAGE CXRemapping clang_getRemappings(const char *);++CINDEX_DEPRECATED CINDEX_LINKAGE CXRemapping+clang_getRemappingsFromFileList(const char **, unsigned);++CINDEX_DEPRECATED CINDEX_LINKAGE unsigned clang_remap_getNumFiles(CXRemapping);++CINDEX_DEPRECATED CINDEX_LINKAGE void+clang_remap_getFilenames(CXRemapping, unsigned, CXString *, CXString *);++CINDEX_DEPRECATED CINDEX_LINKAGE void clang_remap_dispose(CXRemapping);+ LLVM_CLANG_C_EXTERN_C_END #endifdiff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txtindex b6662b66206b2..2b1e266f07392 100644--- a/clang/tools/libclang/CMakeLists.txt+++ b/clang/tools/libclang/CMakeLists.txt@@ -42,6 +42,7 @@ set(SOURCES Indexing.cpp FatalErrorHandler.cpp Rewrite.cpp+ Obsolete.cpp ADDITIONAL_HEADERS CIndexDiagnostic.hdiff --git a/clang/tools/libclang/Obsolete.cpp b/clang/tools/libclang/Obsolete.cppnew file mode 100644index 0000000000000..3596f76e1be6f--- /dev/null+++ b/clang/tools/libclang/Obsolete.cpp@@ -0,0 +1,48 @@+//===- Obsolete.cpp - Obsolete libclang functions and types -------------===//+//+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.+// See https://llvm.org/LICENSE.txt for license information.+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception+//+//===--------------------------------------------------------------------===//+//+// This file contains libclang symbols whose underlying functionality has been+// removed from Clang, but which need to be kept around so as to retain ABI+// compatibility.+//+//===--------------------------------------------------------------------===//++#include "clang-c/CXString.h"+#include "clang-c/Index.h"+#include "clang-c/Platform.h"+#include "llvm/Support/raw_ostream.h"++extern "C" {++// The functions below used to be part of the C API for ARCMigrate, which has+// since been removed from Clang; they already used to print an error if Clang+// was compiled without arcmt support, so we continue doing so.+CXRemapping clang_getRemappings(const char *) {+ llvm::errs() << "error: ARCMigrate has been removed from Clang";+ return nullptr;+}++CXRemapping clang_getRemappingsFromFileList(const char **, unsigned) {+ llvm::errs() << "error: ARCMigrate has been removed from Clang";+ return nullptr;+}++unsigned clang_remap_getNumFiles(CXRemapping) {+ llvm::errs() << "error: ARCMigrate has been removed from Clang";+ return 0;+}++void clang_remap_getFilenames(CXRemapping, unsigned, CXString *, CXString *) {+ llvm::errs() << "error: ARCMigrate has been removed from Clang";+}++void clang_remap_dispose(CXRemapping) {+ llvm::errs() << "error: ARCMigrate has been removed from Clang";+}++} // extern "C"diff --git a/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gnindex 8f7beea152ab7..30b8bb61184bd 100644--- a/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn+++ b/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn@@ -87,6 +87,7 @@ shared_library("libclang") { "Index_Internal.h", "Indexing.cpp", "Rewrite.cpp",+ "Obsolete.cpp", ] if (host_os == "mac") { ldflags = [ |
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.
LGTM
This obviously has to be cherry-picked to the release branch.
AaronBallman approved these changesJul 16, 2025
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.
LGTM, thanks for the quick fix!
1600450 intollvm:main 14 checks passed
Uh oh!
There was an error while loading.Please reload this page.
/cherry-pick1600450 |
/pull-request#149100 |
Don't you have to undo the changes to clang/tools/libclang/libclang.map too? Else these might not be marked as exported on all platforms. (This:https://github.com/llvm/llvm-project/pull/119269/files#diff-2aa9e5e6908b0366b33796fa1f944b25d5b77abdf8eaceac7de55ccadaa7f04f) |
|
I’ve opened#149190 for this. |
nico pushed a commit that referenced this pull requestJul 16, 2025
This is a follow-up to#149079. Seems like we forgot about the fact thatthe symbols also need to be in `libclang.map`.
LLVM Buildbot has detected a new failure on builder Full details are available at:https://lab.llvm.org/buildbot/#/builders/153/builds/38333 Here is the relevant piece of the build log for the reference |
LLVM Buildbot has detected a new failure on builder Full details are available at:https://lab.llvm.org/buildbot/#/builders/42/builds/5387 Here is the relevant piece of the build log for the reference |
tru pushed a commit to llvmbot/llvm-project that referenced this pull requestJul 17, 2025
…lvm#149079)For more context, seellvm#119269 (comment),but briefly, when removing ARCMigrate, I also removed some symbols inlibclang, which constitutes an ABI break that we don’t want, so this prreintroduces the removed symbols; the declarations are marked asdeprecated for future removal, and the implementations print an errorand do nothing, which is what we used to do when ARCMigrate wasdisabled.(cherry picked from commit1600450)
tru pushed a commit to llvmbot/llvm-project that referenced this pull requestJul 17, 2025
This is a follow-up tollvm#149079. Seems like we forgot about the fact thatthe symbols also need to be in `libclang.map`.(cherry picked from commit7e0fde0)
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
6 participants
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.
For more context, see#119269 (comment), but briefly, when removing ARCMigrate, I also removed some symbols in libclang, which constitutes an ABI break that we don’t want, so this pr reintroduces the removed symbols; the declarations are marked as deprecated for future removal, and the implementations print an error and do nothing, which is what we used to do when ARCMigrate was disabled.