[Lldb-commits] [PATCH] D144509: [CMake] Bumps minimum version to 3.20.0.
This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG44c6b905f852: [CMake] Bumps minimum version to 3.20.0. (authored by Mordante). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D144509/new/ https://reviews.llvm.org/D144509 Files: bolt/runtime/CMakeLists.txt clang/CMakeLists.txt clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt compiler-rt/CMakeLists.txt compiler-rt/lib/builtins/CMakeLists.txt compiler-rt/lib/crt/CMakeLists.txt flang/CMakeLists.txt flang/lib/Decimal/CMakeLists.txt flang/runtime/CMakeLists.txt libc/CMakeLists.txt libc/examples/hello_world/CMakeLists.txt libclc/CMakeLists.txt libcxx/CMakeLists.txt libcxxabi/CMakeLists.txt libunwind/CMakeLists.txt libunwind/src/CMakeLists.txt lld/CMakeLists.txt lldb/CMakeLists.txt lldb/tools/debugserver/CMakeLists.txt llvm-libgcc/CMakeLists.txt llvm/CMakeLists.txt llvm/docs/CMake.rst llvm/docs/GettingStarted.rst llvm/docs/ReleaseNotes.rst mlir/CMakeLists.txt mlir/examples/standalone/CMakeLists.txt openmp/CMakeLists.txt openmp/cmake/DetectTestCompiler/CMakeLists.txt openmp/docs/SupportAndFAQ.rst openmp/libompd/src/CMakeLists.txt openmp/libomptarget/plugins/remote/src/CMakeLists.txt openmp/runtime/cmake/LibompCheckLinkerFlag.cmake openmp/tools/Modules/FindOpenMPTarget.cmake openmp/tools/Modules/README.rst polly/CMakeLists.txt pstl/CMakeLists.txt runtimes/CMakeLists.txt Index: runtimes/CMakeLists.txt === --- runtimes/CMakeLists.txt +++ runtimes/CMakeLists.txt @@ -1,12 +1,5 @@ # This file handles building LLVM runtime sub-projects. -cmake_minimum_required(VERSION 3.13.4) -if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0") - message(WARNING -"Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the " -"minimum version of CMake required to build LLVM will become 3.20.0, and " -"using an older CMake will become an error. Please upgrade your CMake to " -"at least 3.20.0 now to avoid issues in the future!") -endif() +cmake_minimum_required(VERSION 3.20.0) project(Runtimes C CXX ASM) # Add path for custom and the LLVM build's modules to the CMake module path. Index: pstl/CMakeLists.txt === --- pstl/CMakeLists.txt +++ pstl/CMakeLists.txt @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # #===--===## -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h") file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$") Index: polly/CMakeLists.txt === --- polly/CMakeLists.txt +++ polly/CMakeLists.txt @@ -1,14 +1,7 @@ # Check if this is a in tree build. if (NOT DEFINED LLVM_MAIN_SRC_DIR) project(Polly) - cmake_minimum_required(VERSION 3.13.4) - if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0") -message(WARNING - "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the " - "minimum version of CMake required to build LLVM will become 3.20.0, and " - "using an older CMake will become an error. Please upgrade your CMake to " - "at least 3.20.0 now to avoid issues in the future!") - endif() + cmake_minimum_required(VERSION 3.20.0) set(POLLY_STANDALONE_BUILD TRUE) endif() Index: openmp/tools/Modules/README.rst === --- openmp/tools/Modules/README.rst +++ openmp/tools/Modules/README.rst @@ -26,7 +26,7 @@ .. code-block:: cmake - cmake_minimum_required(VERSION 3.13.4) + cmake_minimum_required(VERSION 3.20.0) project(offloadTest VERSION 1.0 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp") @@ -37,7 +37,7 @@ target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX) target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp) -Using this module requires at least CMake version 3.13.4. Supported languages +Using this module requires at least CMake version 3.20.0. Supported languages are C and C++ with Fortran support planned in the future. If your application requires building for a specific device architecture you can set the ``OpenMPTarget__ARCH=`` variable. Compiler support is best for Index: openmp/tools/Modules/FindOpenMPTarget.cmake === --- openmp/tools/Modules/FindOpenMPTarget.cmake +++ openmp/tools/Modules/FindOpenMPTarget.cmake @@ -79,7 +79,7 @@ # TODO: Test more compilers cmake_policy(PUSH) -cmake_policy(
[Lldb-commits] [lldb] 77d2f26 - [lldb] Remove unused portion of GetFunctionMethodInfo signature (NFC)
Author: Dave Lee Date: 2023-03-04T19:35:57-08:00 New Revision: 77d2f263c0f3d9c2e7064c6317d41e18aff14289 URL: https://github.com/llvm/llvm-project/commit/77d2f263c0f3d9c2e7064c6317d41e18aff14289 DIFF: https://github.com/llvm/llvm-project/commit/77d2f263c0f3d9c2e7064c6317d41e18aff14289.diff LOG: [lldb] Remove unused portion of GetFunctionMethodInfo signature (NFC) This applies to IsClassMethod as well. Added: Modified: lldb/include/lldb/Symbol/CompilerDeclContext.h lldb/include/lldb/Symbol/SymbolContext.h lldb/include/lldb/Symbol/TypeSystem.h lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h lldb/source/Symbol/CompilerDeclContext.cpp lldb/source/Symbol/SymbolContext.cpp lldb/source/Target/StackFrame.cpp Removed: diff --git a/lldb/include/lldb/Symbol/CompilerDeclContext.h b/lldb/include/lldb/Symbol/CompilerDeclContext.h index 87d4ca30884e9..ca404a6641d5e 100644 --- a/lldb/include/lldb/Symbol/CompilerDeclContext.h +++ b/lldb/include/lldb/Symbol/CompilerDeclContext.h @@ -61,16 +61,6 @@ class CompilerDeclContext { /// Checks if this decl context represents a method of a class. /// - /// \param[out] language_ptr - /// If non NULL and \b true is returned from this function, - /// this will indicate if the language that respresents the method. - /// - /// \param[out] is_instance_method_ptr - /// If non NULL and \b true is returned from this function, - /// this will indicate if the method is an instance function (true) - /// or a class method (false indicating the function is static, or - /// doesn't require an instance of the class to be called). - /// /// \param[out] language_object_name_ptr /// If non NULL and \b true is returned from this function, /// this will indicate if implicit object name for the language @@ -79,9 +69,7 @@ class CompilerDeclContext { /// \return /// Returns true if this is a decl context that represents a method /// in a struct, union or class. - bool IsClassMethod(lldb::LanguageType *language_ptr, - bool *is_instance_method_ptr, - ConstString *language_object_name_ptr); + bool IsClassMethod(ConstString *language_object_name_ptr = nullptr); /// Check if the given other decl context is contained in the lookup /// of this decl context (for example because the other context is a nested diff --git a/lldb/include/lldb/Symbol/SymbolContext.h b/lldb/include/lldb/Symbol/SymbolContext.h index cac951bc19b92..bb9e031d4 100644 --- a/lldb/include/lldb/Symbol/SymbolContext.h +++ b/lldb/include/lldb/Symbol/SymbolContext.h @@ -248,13 +248,6 @@ class SymbolContext { /// If this symbol context represents a function that is a method, return /// true and provide information about the method. /// - /// \param[out] language - /// If \b true is returned, the language for the method. - /// - /// \param[out] is_instance_method - /// If \b true is returned, \b true if this is a instance method, - /// \b false if this is a static/class function. - /// /// \param[out] language_object_name /// If \b true is returned, the name of the artificial variable /// for the language ("this" for C++, "self" for ObjC). @@ -262,9 +255,7 @@ class SymbolContext { /// \return /// \b True if this symbol context represents a function that /// is a method of a class, \b false otherwise. - bool GetFunctionMethodInfo(lldb::LanguageType &language, - bool &is_instance_method, - ConstString &language_object_name); + bool GetFunctionMethodInfo(ConstString &language_object_name); /// Sorts the types in TypeMap according to SymbolContext to TypeList /// diff --git a/lldb/include/lldb/Symbol/TypeSystem.h b/lldb/include/lldb/Symbol/TypeSystem.h index 9c27fd92906a6..7681a700766a2 100644 --- a/lldb/include/lldb/Symbol/TypeSystem.h +++ b/lldb/include/lldb/Symbol/TypeSystem.h @@ -127,9 +127,9 @@ class TypeSystem : public PluginInterface, virtual ConstString DeclContextGetScopeQualifiedName(void *opaque_decl_ctx) = 0; - virtual bool DeclContextIsClassMethod( - void *opaque_decl_ctx, lldb::LanguageType *language_ptr, - bool *is_instance_method_ptr, ConstString *language_object_name_ptr) = 0; + virtual bool + DeclContextIsClassMethod(void *opaque_decl_ctx, + ConstString *language_object_name_ptr) = 0; virtual bool DeclContextIsContainedInLookup(void *opaque_decl_ctx, void *other_opaque_decl_ctx) = 0; diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Cl