MSVSphere Packaging Team
11 months ago
parent
3e22f297ca
commit
d5c6490bdd
@ -1,4 +1,4 @@
|
||||
f005e3b6d41cf92c083d2a16960aaeb1a6e3c76c SOURCES/clang-16.0.6.src.tar.xz
|
||||
bc19124e64c0ffe7ada3d4bad8aec42c0cd05f04 SOURCES/clang-16.0.6.src.tar.xz.sig
|
||||
41c06d541cfcc126ddc344e7f162148f2ecf0461 SOURCES/clang-tools-extra-16.0.6.src.tar.xz
|
||||
cc29485778a6c94ed98f3b2dfb754ef513535691 SOURCES/clang-tools-extra-16.0.6.src.tar.xz.sig
|
||||
2822ff10a016df1fffdeb296f753e9c5fce764ee SOURCES/clang-17.0.6.src.tar.xz
|
||||
576ef9aeccf3febe1828c68b3e11ffa921f3fc92 SOURCES/clang-17.0.6.src.tar.xz.sig
|
||||
1ec17cc98c397d6b4d30f57f14646fa085c9ccce SOURCES/clang-tools-extra-17.0.6.src.tar.xz
|
||||
cba7dea96b093d9989ceb949a21b4180b9d9985e SOURCES/clang-tools-extra-17.0.6.src.tar.xz.sig
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
SOURCES/clang-16.0.6.src.tar.xz
|
||||
SOURCES/clang-16.0.6.src.tar.xz.sig
|
||||
SOURCES/clang-tools-extra-16.0.6.src.tar.xz
|
||||
SOURCES/clang-tools-extra-16.0.6.src.tar.xz.sig
|
||||
SOURCES/clang-17.0.6.src.tar.xz
|
||||
SOURCES/clang-17.0.6.src.tar.xz.sig
|
||||
SOURCES/clang-tools-extra-17.0.6.src.tar.xz
|
||||
SOURCES/clang-tools-extra-17.0.6.src.tar.xz.sig
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 2a0175c88ccd8c162901ac0ade56859d2b599f38 Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Popov <npopov@redhat.com>
|
||||
Date: Mon, 17 Apr 2023 16:19:04 +0200
|
||||
Subject: [PATCH] Change LLVM_COMMON_CMAKE_UTILS usage
|
||||
|
||||
Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are
|
||||
available and stop assuming its directory structure.
|
||||
---
|
||||
clang/CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
|
||||
index 1fff005d6525..f4b3ef4bd15a 100644
|
||||
--- a/clang/CMakeLists.txt
|
||||
+++ b/clang/CMakeLists.txt
|
||||
@@ -1,9 +1,9 @@
|
||||
cmake_minimum_required(VERSION 3.13.4)
|
||||
|
||||
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
|
||||
- set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
|
||||
+ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules)
|
||||
endif()
|
||||
-include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
|
||||
+include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake
|
||||
NO_POLICY_SCOPE)
|
||||
|
||||
# If we are not building as a part of LLVM, build Clang as an
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,21 +1,20 @@
|
||||
From d95d3fbff661c0390072ed0bb4544d5e2aae5c9a Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Thu, 25 Feb 2021 14:09:29 +0100
|
||||
From 49f827b09db549de62dcaf8b90b3fcb3e08c0ee5 Mon Sep 17 00:00:00 2001
|
||||
From: Serge Guelton <sguelton@redhat.com>
|
||||
Date: Mon, 6 Mar 2023 12:37:48 +0100
|
||||
Subject: [PATCH] Make -funwind-tables the default on all archs
|
||||
|
||||
---
|
||||
clang/lib/Driver/ToolChains/Gnu.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
clang/lib/Driver/ToolChains/Gnu.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||
index c8006f3d8412..6ed03adb7702 100644
|
||||
index 24fbdcffc07b..8fed46b49515 100644
|
||||
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||
@@ -2863,6 +2863,11 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
|
||||
case llvm::Triple::ppc64le:
|
||||
@@ -2904,6 +2904,10 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
|
||||
case llvm::Triple::riscv64:
|
||||
case llvm::Triple::x86:
|
||||
case llvm::Triple::x86_64:
|
||||
+
|
||||
+ // Enable -funwind-tables on all architectures supported by Fedora:
|
||||
+ // rhbz#1655546
|
||||
+ case llvm::Triple::systemz:
|
||||
@ -0,0 +1,30 @@
|
||||
From a2449cee8c995b56f1892502aab3dfad3d6f3ca1 Mon Sep 17 00:00:00 2001
|
||||
From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
|
||||
Date: Fri, 8 Sep 2023 11:45:34 -0300
|
||||
Subject: [PATCH] Workaround a bug in ORC on ppc64le
|
||||
|
||||
The Jit code appears to be returning the wrong printf symbol on ppc64le
|
||||
after the transition of the default long double to IEEE 128-bit floating
|
||||
point.
|
||||
---
|
||||
clang/unittests/Interpreter/InterpreterTest.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/clang/unittests/Interpreter/InterpreterTest.cpp b/clang/unittests/Interpreter/InterpreterTest.cpp
|
||||
index abb8e6377aab..7b6697ebc6ed 100644
|
||||
--- a/clang/unittests/Interpreter/InterpreterTest.cpp
|
||||
+++ b/clang/unittests/Interpreter/InterpreterTest.cpp
|
||||
@@ -243,7 +243,9 @@ TEST(IncrementalProcessing, FindMangledNameSymbol) {
|
||||
EXPECT_FALSE(!Addr);
|
||||
|
||||
// FIXME: Re-enable when we investigate the way we handle dllimports on Win.
|
||||
-#ifndef _WIN32
|
||||
+ // FIXME: The printf symbol returned from the Jit may not be correct on
|
||||
+ // ppc64le when the default long double is IEEE 128-bit fp.
|
||||
+#if !defined _WIN32 && !(defined __PPC64__ && defined __LITTLE_ENDIAN__)
|
||||
EXPECT_EQ((uintptr_t)&printf, Addr->getValue());
|
||||
#endif // _WIN32
|
||||
}
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,38 +1,26 @@
|
||||
From f4e2d711e5cfd8e357d770e2da7a114086ee8659 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>
|
||||
Date: Thu, 22 Sep 2022 10:49:43 +0200
|
||||
Subject: disable recommonmark
|
||||
|
||||
---
|
||||
clang/docs/conf.py | 15 +--------------
|
||||
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||
|
||||
diff --git a/clang/docs/conf.py b/clang/docs/conf.py
|
||||
index b8a42018191a..912449a7f792 100644
|
||||
--- a/clang/docs/conf.py
|
||||
+++ b/clang/docs/conf.py
|
||||
@@ -37,20 +37,7 @@ source_suffix = {
|
||||
'.rst': 'restructuredtext',
|
||||
diff -Naur a/clang/docs/conf.py b/clang/docs/conf.py
|
||||
--- a/clang/docs/conf.py 2020-09-15 09:12:24.318287611 +0000
|
||||
+++ b/clang/docs/conf.py 2020-09-15 15:01:00.025893199 +0000
|
||||
@@ -37,21 +37,7 @@
|
||||
".rst": "restructuredtext",
|
||||
}
|
||||
|
||||
-try:
|
||||
- import recommonmark
|
||||
-except ImportError:
|
||||
- # manpages do not use any .md sources
|
||||
- if not tags.has('builder-man'):
|
||||
- if not tags.has("builder-man"):
|
||||
- raise
|
||||
-else:
|
||||
- import sphinx
|
||||
-
|
||||
- if sphinx.version_info >= (3, 0):
|
||||
- # This requires 0.5 or later.
|
||||
- extensions.append('recommonmark')
|
||||
- extensions.append("recommonmark")
|
||||
- else:
|
||||
- source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
|
||||
- source_suffix['.md'] = 'markdown'
|
||||
- source_parsers = {".md": "recommonmark.parser.CommonMarkParser"}
|
||||
- source_suffix[".md"] = "markdown"
|
||||
+import sphinx
|
||||
|
||||
# The encoding of source files.
|
||||
#source_encoding = 'utf-8-sig'
|
||||
--
|
||||
2.37.1
|
||||
|
||||
# source_encoding = 'utf-8-sig'
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 04b642c646048dd9df652eba05d45beaa13bc895 Mon Sep 17 00:00:00 2001
|
||||
From: Konrad Kleine <kkleine@redhat.com>
|
||||
Date: Mon, 23 Jan 2023 13:14:17 +0000
|
||||
Subject: [PATCH] Rebased D138472
|
||||
|
||||
---
|
||||
clang/CMakeLists.txt | 23 ++++++++++-------------
|
||||
1 file changed, 10 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
|
||||
index 090cfa352078..f87838776c32 100644
|
||||
--- a/clang/CMakeLists.txt
|
||||
+++ b/clang/CMakeLists.txt
|
||||
@@ -118,12 +118,11 @@ if(CLANG_BUILT_STANDALONE)
|
||||
set(LLVM_UTILS_PROVIDED ON)
|
||||
set(CLANG_TEST_DEPS FileCheck count not)
|
||||
endif()
|
||||
- set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
|
||||
- if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
|
||||
- AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
- AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
|
||||
- add_subdirectory(${UNITTEST_DIR} third-party/unittest)
|
||||
- endif()
|
||||
+ endif()
|
||||
+
|
||||
+ find_package(LLVMGTest HINTS "${LLVM_CMAKE_DIR}")
|
||||
+ if (NOT TARGET llvm_gtest)
|
||||
+ message(FATAL_ERROR "llvm-gtest not found. Please install llvm-gtest or disable tests with -DLLVM_INCLUDE_TESTS=OFF")
|
||||
endif()
|
||||
|
||||
if(LLVM_LIT)
|
||||
@@ -506,13 +505,11 @@ endif()
|
||||
|
||||
|
||||
if( CLANG_INCLUDE_TESTS )
|
||||
- if(EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
|
||||
- add_subdirectory(unittests)
|
||||
- list(APPEND CLANG_TEST_DEPS ClangUnitTests)
|
||||
- list(APPEND CLANG_TEST_PARAMS
|
||||
- clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg
|
||||
- )
|
||||
- endif()
|
||||
+ add_subdirectory(unittests)
|
||||
+ list(APPEND CLANG_TEST_DEPS ClangUnitTests)
|
||||
+ list(APPEND CLANG_TEST_PARAMS
|
||||
+ clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg
|
||||
+ )
|
||||
add_subdirectory(test)
|
||||
add_subdirectory(bindings/python/tests)
|
||||
|
||||
--
|
||||
2.34.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt
|
||||
--- a/clang/lib/Basic/CMakeLists.txt
|
||||
+++ b/clang/lib/Basic/CMakeLists.txt
|
||||
@@ -110,7 +110,7 @@
|
||||
|
||||
DEPENDS
|
||||
omp_gen
|
||||
- RISCVTargetParserTableGen
|
||||
+ LLVMTargetParser
|
||||
)
|
||||
|
||||
target_link_libraries(clangBasic
|
||||
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
|
||||
--- a/clang/lib/Driver/CMakeLists.txt
|
||||
+++ b/clang/lib/Driver/CMakeLists.txt
|
||||
@@ -93,7 +93,7 @@
|
||||
|
||||
DEPENDS
|
||||
ClangDriverOptions
|
||||
- RISCVTargetParserTableGen
|
||||
+ LLVMTargetParser
|
||||
|
||||
LINK_LIBS
|
||||
clangBasic
|
||||
|
||||
@ -0,0 +1,298 @@
|
||||
commit ad4a5130277776d8f15f40ac5a6dede6ad3aabfb
|
||||
Author: Timm Bäder <tbaeder@redhat.com>
|
||||
Date: Tue Aug 8 14:11:33 2023 +0200
|
||||
|
||||
[clang][CFG] Cleanup functions
|
||||
|
||||
Add declarations declared with attribute(cleanup(...)) to the CFG,
|
||||
similar to destructors.
|
||||
|
||||
Differential Revision: https://reviews.llvm.org/D157385
|
||||
|
||||
diff --git a/clang/include/clang/Analysis/CFG.h b/clang/include/clang/Analysis/CFG.h
|
||||
index cf4fa2da2a35..67383bb316d3 100644
|
||||
--- a/clang/include/clang/Analysis/CFG.h
|
||||
+++ b/clang/include/clang/Analysis/CFG.h
|
||||
@@ -14,10 +14,11 @@
|
||||
#ifndef LLVM_CLANG_ANALYSIS_CFG_H
|
||||
#define LLVM_CLANG_ANALYSIS_CFG_H
|
||||
|
||||
-#include "clang/Analysis/Support/BumpVector.h"
|
||||
-#include "clang/Analysis/ConstructionContext.h"
|
||||
+#include "clang/AST/Attr.h"
|
||||
#include "clang/AST/ExprCXX.h"
|
||||
#include "clang/AST/ExprObjC.h"
|
||||
+#include "clang/Analysis/ConstructionContext.h"
|
||||
+#include "clang/Analysis/Support/BumpVector.h"
|
||||
#include "clang/Basic/LLVM.h"
|
||||
#include "llvm/ADT/DenseMap.h"
|
||||
#include "llvm/ADT/GraphTraits.h"
|
||||
@@ -74,7 +75,8 @@ public:
|
||||
MemberDtor,
|
||||
TemporaryDtor,
|
||||
DTOR_BEGIN = AutomaticObjectDtor,
|
||||
- DTOR_END = TemporaryDtor
|
||||
+ DTOR_END = TemporaryDtor,
|
||||
+ CleanupFunction,
|
||||
};
|
||||
|
||||
protected:
|
||||
@@ -383,6 +385,32 @@ private:
|
||||
}
|
||||
};
|
||||
|
||||
+class CFGCleanupFunction final : public CFGElement {
|
||||
+public:
|
||||
+ CFGCleanupFunction() = default;
|
||||
+ CFGCleanupFunction(const VarDecl *VD)
|
||||
+ : CFGElement(Kind::CleanupFunction, VD) {
|
||||
+ assert(VD->hasAttr<CleanupAttr>());
|
||||
+ }
|
||||
+
|
||||
+ const VarDecl *getVarDecl() const {
|
||||
+ return static_cast<VarDecl *>(Data1.getPointer());
|
||||
+ }
|
||||
+
|
||||
+ /// Returns the function to be called when cleaning up the var decl.
|
||||
+ const FunctionDecl *getFunctionDecl() const {
|
||||
+ const CleanupAttr *A = getVarDecl()->getAttr<CleanupAttr>();
|
||||
+ return A->getFunctionDecl();
|
||||
+ }
|
||||
+
|
||||
+private:
|
||||
+ friend class CFGElement;
|
||||
+
|
||||
+ static bool isKind(const CFGElement E) {
|
||||
+ return E.getKind() == Kind::CleanupFunction;
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
/// Represents C++ object destructor implicitly generated for automatic object
|
||||
/// or temporary bound to const reference at the point of leaving its local
|
||||
/// scope.
|
||||
@@ -1142,6 +1170,10 @@ public:
|
||||
Elements.push_back(CFGAutomaticObjDtor(VD, S), C);
|
||||
}
|
||||
|
||||
+ void appendCleanupFunction(const VarDecl *VD, BumpVectorContext &C) {
|
||||
+ Elements.push_back(CFGCleanupFunction(VD), C);
|
||||
+ }
|
||||
+
|
||||
void appendLifetimeEnds(VarDecl *VD, Stmt *S, BumpVectorContext &C) {
|
||||
Elements.push_back(CFGLifetimeEnds(VD, S), C);
|
||||
}
|
||||
diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
|
||||
index b82f9010a83f..03ab4c6fdf29 100644
|
||||
--- a/clang/lib/Analysis/CFG.cpp
|
||||
+++ b/clang/lib/Analysis/CFG.cpp
|
||||
@@ -881,6 +881,10 @@ private:
|
||||
B->appendAutomaticObjDtor(VD, S, cfg->getBumpVectorContext());
|
||||
}
|
||||
|
||||
+ void appendCleanupFunction(CFGBlock *B, VarDecl *VD) {
|
||||
+ B->appendCleanupFunction(VD, cfg->getBumpVectorContext());
|
||||
+ }
|
||||
+
|
||||
void appendLifetimeEnds(CFGBlock *B, VarDecl *VD, Stmt *S) {
|
||||
B->appendLifetimeEnds(VD, S, cfg->getBumpVectorContext());
|
||||
}
|
||||
@@ -1346,7 +1350,8 @@ private:
|
||||
return {};
|
||||
}
|
||||
|
||||
- bool hasTrivialDestructor(VarDecl *VD);
|
||||
+ bool hasTrivialDestructor(const VarDecl *VD) const;
|
||||
+ bool needsAutomaticDestruction(const VarDecl *VD) const;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
@@ -1861,14 +1866,14 @@ void CFGBuilder::addAutomaticObjDestruction(LocalScope::const_iterator B,
|
||||
if (B == E)
|
||||
return;
|
||||
|
||||
- SmallVector<VarDecl *, 10> DeclsNonTrivial;
|
||||
- DeclsNonTrivial.reserve(B.distance(E));
|
||||
+ SmallVector<VarDecl *, 10> DeclsNeedDestruction;
|
||||
+ DeclsNeedDestruction.reserve(B.distance(E));
|
||||
|
||||
for (VarDecl* D : llvm::make_range(B, E))
|
||||
- if (!hasTrivialDestructor(D))
|
||||
- DeclsNonTrivial.push_back(D);
|
||||
+ if (needsAutomaticDestruction(D))
|
||||
+ DeclsNeedDestruction.push_back(D);
|
||||
|
||||
- for (VarDecl *VD : llvm::reverse(DeclsNonTrivial)) {
|
||||
+ for (VarDecl *VD : llvm::reverse(DeclsNeedDestruction)) {
|
||||
if (BuildOpts.AddImplicitDtors) {
|
||||
// If this destructor is marked as a no-return destructor, we need to
|
||||
// create a new block for the destructor which does not have as a
|
||||
@@ -1879,7 +1884,8 @@ void CFGBuilder::addAutomaticObjDestruction(LocalScope::const_iterator B,
|
||||
Ty = getReferenceInitTemporaryType(VD->getInit());
|
||||
Ty = Context->getBaseElementType(Ty);
|
||||
|
||||
- if (Ty->getAsCXXRecordDecl()->isAnyDestructorNoReturn())
|
||||
+ const CXXRecordDecl *CRD = Ty->getAsCXXRecordDecl();
|
||||
+ if (CRD && CRD->isAnyDestructorNoReturn())
|
||||
Block = createNoReturnBlock();
|
||||
}
|
||||
|
||||
@@ -1890,8 +1896,10 @@ void CFGBuilder::addAutomaticObjDestruction(LocalScope::const_iterator B,
|
||||
// objects, we end lifetime with scope end.
|
||||
if (BuildOpts.AddLifetime)
|
||||
appendLifetimeEnds(Block, VD, S);
|
||||
- if (BuildOpts.AddImplicitDtors)
|
||||
+ if (BuildOpts.AddImplicitDtors && !hasTrivialDestructor(VD))
|
||||
appendAutomaticObjDtor(Block, VD, S);
|
||||
+ if (VD->hasAttr<CleanupAttr>())
|
||||
+ appendCleanupFunction(Block, VD);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1922,7 +1930,7 @@ void CFGBuilder::addScopeExitHandling(LocalScope::const_iterator B,
|
||||
// is destroyed, for automatic variables, this happens when the end of the
|
||||
// scope is added.
|
||||
for (VarDecl* D : llvm::make_range(B, E))
|
||||
- if (hasTrivialDestructor(D))
|
||||
+ if (!needsAutomaticDestruction(D))
|
||||
DeclsTrivial.push_back(D);
|
||||
|
||||
if (DeclsTrivial.empty())
|
||||
@@ -2095,7 +2103,11 @@ LocalScope* CFGBuilder::addLocalScopeForDeclStmt(DeclStmt *DS,
|
||||
return Scope;
|
||||
}
|
||||
|
||||
-bool CFGBuilder::hasTrivialDestructor(VarDecl *VD) {
|
||||
+bool CFGBuilder::needsAutomaticDestruction(const VarDecl *VD) const {
|
||||
+ return !hasTrivialDestructor(VD) || VD->hasAttr<CleanupAttr>();
|
||||
+}
|
||||
+
|
||||
+bool CFGBuilder::hasTrivialDestructor(const VarDecl *VD) const {
|
||||
// Check for const references bound to temporary. Set type to pointee.
|
||||
QualType QT = VD->getType();
|
||||
if (QT->isReferenceType()) {
|
||||
@@ -2149,7 +2161,7 @@ LocalScope* CFGBuilder::addLocalScopeForVarDecl(VarDecl *VD,
|
||||
return Scope;
|
||||
|
||||
if (!BuildOpts.AddLifetime && !BuildOpts.AddScopes &&
|
||||
- hasTrivialDestructor(VD)) {
|
||||
+ !needsAutomaticDestruction(VD)) {
|
||||
assert(BuildOpts.AddImplicitDtors);
|
||||
return Scope;
|
||||
}
|
||||
@@ -5287,6 +5299,7 @@ CFGImplicitDtor::getDestructorDecl(ASTContext &astContext) const {
|
||||
case CFGElement::CXXRecordTypedCall:
|
||||
case CFGElement::ScopeBegin:
|
||||
case CFGElement::ScopeEnd:
|
||||
+ case CFGElement::CleanupFunction:
|
||||
llvm_unreachable("getDestructorDecl should only be used with "
|
||||
"ImplicitDtors");
|
||||
case CFGElement::AutomaticObjectDtor: {
|
||||
@@ -5830,6 +5843,11 @@ static void print_elem(raw_ostream &OS, StmtPrinterHelper &Helper,
|
||||
break;
|
||||
}
|
||||
|
||||
+ case CFGElement::Kind::CleanupFunction:
|
||||
+ OS << "CleanupFunction ("
|
||||
+ << E.castAs<CFGCleanupFunction>().getFunctionDecl()->getName() << ")\n";
|
||||
+ break;
|
||||
+
|
||||
case CFGElement::Kind::LifetimeEnds:
|
||||
Helper.handleDecl(E.castAs<CFGLifetimeEnds>().getVarDecl(), OS);
|
||||
OS << " (Lifetime ends)\n";
|
||||
diff --git a/clang/lib/Analysis/PathDiagnostic.cpp b/clang/lib/Analysis/PathDiagnostic.cpp
|
||||
index 348afc42319e..0cb03943c547 100644
|
||||
--- a/clang/lib/Analysis/PathDiagnostic.cpp
|
||||
+++ b/clang/lib/Analysis/PathDiagnostic.cpp
|
||||
@@ -567,6 +567,7 @@ getLocationForCaller(const StackFrameContext *SFC,
|
||||
}
|
||||
case CFGElement::ScopeBegin:
|
||||
case CFGElement::ScopeEnd:
|
||||
+ case CFGElement::CleanupFunction:
|
||||
llvm_unreachable("not yet implemented!");
|
||||
case CFGElement::LifetimeEnds:
|
||||
case CFGElement::LoopExit:
|
||||
diff --git a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
|
||||
index 0e2ac78f7089..d7c5bd1d4042 100644
|
||||
--- a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
|
||||
+++ b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
|
||||
@@ -993,6 +993,7 @@ void ExprEngine::processCFGElement(const CFGElement E, ExplodedNode *Pred,
|
||||
ProcessLoopExit(E.castAs<CFGLoopExit>().getLoopStmt(), Pred);
|
||||
return;
|
||||
case CFGElement::LifetimeEnds:
|
||||
+ case CFGElement::CleanupFunction:
|
||||
case CFGElement::ScopeBegin:
|
||||
case CFGElement::ScopeEnd:
|
||||
return;
|
||||
diff --git a/clang/test/Analysis/scopes-cfg-output.cpp b/clang/test/Analysis/scopes-cfg-output.cpp
|
||||
index 6877d124e67a..4eb8967e3735 100644
|
||||
--- a/clang/test/Analysis/scopes-cfg-output.cpp
|
||||
+++ b/clang/test/Analysis/scopes-cfg-output.cpp
|
||||
@@ -1419,3 +1419,68 @@ label:
|
||||
}
|
||||
}
|
||||
}
|
||||
+
|
||||
+// CHECK: [B1]
|
||||
+// CHECK-NEXT: 1: CFGScopeBegin(i)
|
||||
+// CHECK-NEXT: 2: int i __attribute__((cleanup(cleanup_int)));
|
||||
+// CHECK-NEXT: 3: CleanupFunction (cleanup_int)
|
||||
+// CHECK-NEXT: 4: CFGScopeEnd(i)
|
||||
+void cleanup_int(int *i);
|
||||
+void test_cleanup_functions() {
|
||||
+ int i __attribute__((cleanup(cleanup_int)));
|
||||
+}
|
||||
+
|
||||
+// CHECK: [B1]
|
||||
+// CHECK-NEXT: 1: 10
|
||||
+// CHECK-NEXT: 2: i
|
||||
+// CHECK-NEXT: 3: [B1.2] = [B1.1]
|
||||
+// CHECK-NEXT: 4: return;
|
||||
+// CHECK-NEXT: 5: CleanupFunction (cleanup_int)
|
||||
+// CHECK-NEXT: 6: CFGScopeEnd(i)
|
||||
+// CHECK-NEXT: Preds (1): B3
|
||||
+// CHECK-NEXT: Succs (1): B0
|
||||
+// CHECK: [B2]
|
||||
+// CHECK-NEXT: 1: return;
|
||||
+// CHECK-NEXT: 2: CleanupFunction (cleanup_int)
|
||||
+// CHECK-NEXT: 3: CFGScopeEnd(i)
|
||||
+// CHECK-NEXT: Preds (1): B3
|
||||
+// CHECK-NEXT: Succs (1): B0
|
||||
+// CHECK: [B3]
|
||||
+// CHECK-NEXT: 1: CFGScopeBegin(i)
|
||||
+// CHECK-NEXT: 2: int i __attribute__((cleanup(cleanup_int)));
|
||||
+// CHECK-NEXT: 3: m
|
||||
+// CHECK-NEXT: 4: [B3.3] (ImplicitCastExpr, LValueToRValue, int)
|
||||
+// CHECK-NEXT: 5: 1
|
||||
+// CHECK-NEXT: 6: [B3.4] == [B3.5]
|
||||
+// CHECK-NEXT: T: if [B3.6]
|
||||
+// CHECK-NEXT: Preds (1): B4
|
||||
+// CHECK-NEXT: Succs (2): B2 B1
|
||||
+void test_cleanup_functions2(int m) {
|
||||
+ int i __attribute__((cleanup(cleanup_int)));
|
||||
+
|
||||
+ if (m == 1) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ i = 10;
|
||||
+ return;
|
||||
+}
|
||||
+
|
||||
+// CHECK: [B1]
|
||||
+// CHECK-NEXT: 1: CFGScopeBegin(f)
|
||||
+// CHECK-NEXT: 2: (CXXConstructExpr, [B1.3], F)
|
||||
+// CHECK-NEXT: 3: F f __attribute__((cleanup(cleanup_F)));
|
||||
+// CHECK-NEXT: 4: CleanupFunction (cleanup_F)
|
||||
+// CHECK-NEXT: 5: [B1.3].~F() (Implicit destructor)
|
||||
+// CHECK-NEXT: 6: CFGScopeEnd(f)
|
||||
+// CHECK-NEXT: Preds (1): B2
|
||||
+// CHECK-NEXT: Succs (1): B0
|
||||
+class F {
|
||||
+public:
|
||||
+ ~F();
|
||||
+};
|
||||
+void cleanup_F(F *f);
|
||||
+
|
||||
+void test() {
|
||||
+ F f __attribute((cleanup(cleanup_F)));
|
||||
+}
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/clang/test/Driver/ppc-float-abi-warning.cpp b/clang/test/Driver/ppc-float-abi-warning.cpp
|
||||
index e3baa9f4c059..87d6d87a3b31 100644
|
||||
--- a/clang/test/Driver/ppc-float-abi-warning.cpp
|
||||
+++ b/clang/test/Driver/ppc-float-abi-warning.cpp
|
||||
@@ -17,10 +17,12 @@
|
||||
// RUN: -mabi=ieeelongdouble -stdlib=libc++ -Wno-unsupported-abi 2>&1 | \
|
||||
// RUN: FileCheck %s --check-prefix=NOWARN
|
||||
// RUN: %clang -### --driver-mode=g++ -target powerpc64le-linux-gnu %s\
|
||||
+// RUN: --dyld-prefix=%S/Inputs/powerpc64le-linux-gnu-tree/gcc-12 \
|
||||
// RUN: -mabi=%if ppc_linux_default_ieeelongdouble %{ieeelongdouble%} \
|
||||
// RUN: %else %{ibmlongdouble%} -stdlib=libc++ 2>&1 | \
|
||||
// RUN: FileCheck %s --check-prefix=NOWARN
|
||||
// RUN: %clang -### --driver-mode=g++ -target powerpc64le-linux-gnu %s\
|
||||
+// RUN: --dyld-prefix=%S/Inputs/powerpc64le-linux-gnu-tree/gcc-12 \
|
||||
// RUN: -mabi=%if ppc_linux_default_ieeelongdouble %{ibmlongdouble%} \
|
||||
// RUN: %else %{ieeelongdouble%} -stdlib=libc++ 2>&1 | FileCheck %s
|
||||
@ -0,0 +1,124 @@
|
||||
commit cf8e189a99f988398a48148b9ea7901948665ab0
|
||||
Author: Timm Bäder <tbaeder@redhat.com>
|
||||
Date: Wed Sep 6 12:19:20 2023 +0200
|
||||
|
||||
[clang][TSA] Thread safety cleanup functions
|
||||
|
||||
Consider cleanup functions in thread safety analysis.
|
||||
|
||||
Differential Revision: https://reviews.llvm.org/D152504
|
||||
|
||||
diff --git a/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h b/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
|
||||
index 9d28325c1ea6..13e37ac2b56b 100644
|
||||
--- a/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
|
||||
+++ b/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
|
||||
@@ -361,7 +361,7 @@ public:
|
||||
unsigned NumArgs = 0;
|
||||
|
||||
// Function arguments
|
||||
- const Expr *const *FunArgs = nullptr;
|
||||
+ llvm::PointerUnion<const Expr *const *, til::SExpr *> FunArgs = nullptr;
|
||||
|
||||
// is Self referred to with -> or .?
|
||||
bool SelfArrow = false;
|
||||
diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp
|
||||
index 3107d035254d..3e6ceb7d54c4 100644
|
||||
--- a/clang/lib/Analysis/ThreadSafety.cpp
|
||||
+++ b/clang/lib/Analysis/ThreadSafety.cpp
|
||||
@@ -1773,7 +1773,8 @@ void BuildLockset::checkPtAccess(const Expr *Exp, AccessKind AK,
|
||||
///
|
||||
/// \param Exp The call expression.
|
||||
/// \param D The callee declaration.
|
||||
-/// \param Self If \p Exp = nullptr, the implicit this argument.
|
||||
+/// \param Self If \p Exp = nullptr, the implicit this argument or the argument
|
||||
+/// of an implicitly called cleanup function.
|
||||
/// \param Loc If \p Exp = nullptr, the location.
|
||||
void BuildLockset::handleCall(const Expr *Exp, const NamedDecl *D,
|
||||
til::LiteralPtr *Self, SourceLocation Loc) {
|
||||
@@ -2417,6 +2418,15 @@ void ThreadSafetyAnalyzer::runAnalysis(AnalysisDeclContext &AC) {
|
||||
AD.getTriggerStmt()->getEndLoc());
|
||||
break;
|
||||
}
|
||||
+
|
||||
+ case CFGElement::CleanupFunction: {
|
||||
+ const CFGCleanupFunction &CF = BI.castAs<CFGCleanupFunction>();
|
||||
+ LocksetBuilder.handleCall(/*Exp=*/nullptr, CF.getFunctionDecl(),
|
||||
+ SxBuilder.createVariable(CF.getVarDecl()),
|
||||
+ CF.getVarDecl()->getLocation());
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
case CFGElement::TemporaryDtor: {
|
||||
auto TD = BI.castAs<CFGTemporaryDtor>();
|
||||
|
||||
diff --git a/clang/lib/Analysis/ThreadSafetyCommon.cpp b/clang/lib/Analysis/ThreadSafetyCommon.cpp
|
||||
index b8286cef396c..63cc66852a9e 100644
|
||||
--- a/clang/lib/Analysis/ThreadSafetyCommon.cpp
|
||||
+++ b/clang/lib/Analysis/ThreadSafetyCommon.cpp
|
||||
@@ -110,7 +110,8 @@ static StringRef ClassifyDiagnostic(QualType VDT) {
|
||||
/// \param D The declaration to which the attribute is attached.
|
||||
/// \param DeclExp An expression involving the Decl to which the attribute
|
||||
/// is attached. E.g. the call to a function.
|
||||
-/// \param Self S-expression to substitute for a \ref CXXThisExpr.
|
||||
+/// \param Self S-expression to substitute for a \ref CXXThisExpr in a call,
|
||||
+/// or argument to a cleanup function.
|
||||
CapabilityExpr SExprBuilder::translateAttrExpr(const Expr *AttrExp,
|
||||
const NamedDecl *D,
|
||||
const Expr *DeclExp,
|
||||
@@ -144,7 +145,11 @@ CapabilityExpr SExprBuilder::translateAttrExpr(const Expr *AttrExp,
|
||||
|
||||
if (Self) {
|
||||
assert(!Ctx.SelfArg && "Ambiguous self argument");
|
||||
- Ctx.SelfArg = Self;
|
||||
+ assert(isa<FunctionDecl>(D) && "Self argument requires function");
|
||||
+ if (isa<CXXMethodDecl>(D))
|
||||
+ Ctx.SelfArg = Self;
|
||||
+ else
|
||||
+ Ctx.FunArgs = Self;
|
||||
|
||||
// If the attribute has no arguments, then assume the argument is "this".
|
||||
if (!AttrExp)
|
||||
@@ -312,8 +317,14 @@ til::SExpr *SExprBuilder::translateDeclRefExpr(const DeclRefExpr *DRE,
|
||||
? (cast<FunctionDecl>(D)->getCanonicalDecl() == Canonical)
|
||||
: (cast<ObjCMethodDecl>(D)->getCanonicalDecl() == Canonical)) {
|
||||
// Substitute call arguments for references to function parameters
|
||||
- assert(I < Ctx->NumArgs);
|
||||
- return translate(Ctx->FunArgs[I], Ctx->Prev);
|
||||
+ if (const Expr *const *FunArgs =
|
||||
+ Ctx->FunArgs.dyn_cast<const Expr *const *>()) {
|
||||
+ assert(I < Ctx->NumArgs);
|
||||
+ return translate(FunArgs[I], Ctx->Prev);
|
||||
+ }
|
||||
+
|
||||
+ assert(I == 0);
|
||||
+ return Ctx->FunArgs.get<til::SExpr *>();
|
||||
}
|
||||
}
|
||||
// Map the param back to the param of the original function declaration
|
||||
diff --git a/clang/test/Sema/warn-thread-safety-analysis.c b/clang/test/Sema/warn-thread-safety-analysis.c
|
||||
index 355616b73d96..642ea88ec3c9 100644
|
||||
--- a/clang/test/Sema/warn-thread-safety-analysis.c
|
||||
+++ b/clang/test/Sema/warn-thread-safety-analysis.c
|
||||
@@ -72,6 +72,8 @@ int get_value(int *p) SHARED_LOCKS_REQUIRED(foo_.mu_){
|
||||
return *p;
|
||||
}
|
||||
|
||||
+void unlock_scope(struct Mutex *const *mu) __attribute__((release_capability(**mu)));
|
||||
+
|
||||
int main(void) {
|
||||
|
||||
Foo_fun1(1); // expected-warning{{calling function 'Foo_fun1' requires holding mutex 'mu2'}} \
|
||||
@@ -127,6 +129,13 @@ int main(void) {
|
||||
// expected-note@-1{{mutex released here}}
|
||||
mutex_shared_unlock(&mu1); // expected-warning {{releasing mutex 'mu1' that was not held}}
|
||||
|
||||
+ /// Cleanup functions
|
||||
+ {
|
||||
+ struct Mutex* const __attribute__((cleanup(unlock_scope))) scope = &mu1;
|
||||
+ mutex_exclusive_lock(scope); // Note that we have to lock through scope, because no alias analysis!
|
||||
+ // Cleanup happens automatically -> no warning.
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue