[clang] [clang][Diagnostics] Make 'note' color CYAN (PR #66997)
cor3ntin wrote: > I keep forgetting to add release notes and @AaronBallman hasn't reminded me > in a while - is this work a release note? Yes! https://github.com/llvm/llvm-project/pull/66997 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [PowerPC] Support local-dynamic TLS relocation on AIX (PR #66316)
orcguru wrote: > Also, is it intentional that we combined the patch to enable local-dynamic in > clang within this patch? Just wondering since I thought I saw a separate > patch for the clang portion before (unless I am mistaken). Yes, I have to combine all changes into a monolithic patch, similar reason as mentioned by Kai. Otherwise those smaller patches will have to be serialized, review and commit one-by-one. https://github.com/llvm/llvm-project/pull/66316 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf updated https://github.com/llvm/llvm-project/pull/66430
>From 47392e5996cccada1d638495a9376b0430142c8c Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+...@users.noreply.github.com>
Date: Thu, 14 Sep 2023 21:58:21 +0200
Subject: [PATCH 1/9] Introduce PagedVector class
The goal of the class is to be an (almost) drop in replacement for
SmallVector and std::vector when those are presized and filled later,
as it happens in SourceManager and ASTReader.
By splitting the actual vector in pages of the same size and allocating
the pages only when they are needed, using this containers reduces the
memory usage by a factor 4 for the cases relevant to the ALICE
experiment ROOT / cling usage.
---
clang/include/clang/Basic/SourceManager.h | 3 +-
clang/include/clang/Serialization/ASTReader.h | 5 +-
clang/lib/Basic/SourceManager.cpp | 10 +-
clang/lib/Serialization/ASTReader.cpp | 5 +-
llvm/docs/ProgrammersManual.rst | 33 ++
llvm/include/llvm/ADT/PagedVector.h | 323 +
llvm/unittests/ADT/CMakeLists.txt | 1 +
llvm/unittests/ADT/PagedVectorTest.cpp| 342 ++
8 files changed, 712 insertions(+), 10 deletions(-)
create mode 100644 llvm/include/llvm/ADT/PagedVector.h
create mode 100644 llvm/unittests/ADT/PagedVectorTest.cpp
diff --git a/clang/include/clang/Basic/SourceManager.h
b/clang/include/clang/Basic/SourceManager.h
index 2f846502d6f3327..e37caa2252532f9 100644
--- a/clang/include/clang/Basic/SourceManager.h
+++ b/clang/include/clang/Basic/SourceManager.h
@@ -43,6 +43,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
+#include "llvm/ADT/PagedVector.h"
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
@@ -699,7 +700,7 @@ class SourceManager : public RefCountedBase {
///
/// Negative FileIDs are indexes into this table. To get from ID to an index,
/// use (-ID - 2).
- SmallVector LoadedSLocEntryTable;
+ llvm::PagedVector LoadedSLocEntryTable;
/// The starting offset of the next local SLocEntry.
///
diff --git a/clang/include/clang/Serialization/ASTReader.h
b/clang/include/clang/Serialization/ASTReader.h
index dc1eb21c27801fe..65e19c6e44cf571 100644
--- a/clang/include/clang/Serialization/ASTReader.h
+++ b/clang/include/clang/Serialization/ASTReader.h
@@ -38,6 +38,7 @@
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/MapVector.h"
+#include "llvm/ADT/PagedVector.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallPtrSet.h"
@@ -487,7 +488,7 @@ class ASTReader
///
/// When the pointer at index I is non-NULL, the type with
/// ID = (I + 1) << FastQual::Width has already been loaded
- std::vector TypesLoaded;
+ llvm::PagedVector TypesLoaded;
using GlobalTypeMapType =
ContinuousRangeMap;
@@ -501,7 +502,7 @@ class ASTReader
///
/// When the pointer at index I is non-NULL, the declaration with ID
/// = I + 1 has already been loaded.
- std::vector DeclsLoaded;
+ llvm::PagedVector DeclsLoaded;
using GlobalDeclMapType =
ContinuousRangeMap;
diff --git a/clang/lib/Basic/SourceManager.cpp
b/clang/lib/Basic/SourceManager.cpp
index 0521ac7b30339ab..7fa8b8096ac4931 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -2344,11 +2344,11 @@ SourceManager::MemoryBufferSizes
SourceManager::getMemoryBufferSizes() const {
}
size_t SourceManager::getDataStructureSizes() const {
- size_t size = llvm::capacity_in_bytes(MemBufferInfos)
-+ llvm::capacity_in_bytes(LocalSLocEntryTable)
-+ llvm::capacity_in_bytes(LoadedSLocEntryTable)
-+ llvm::capacity_in_bytes(SLocEntryLoaded)
-+ llvm::capacity_in_bytes(FileInfos);
+ size_t size = llvm::capacity_in_bytes(MemBufferInfos) +
+llvm::capacity_in_bytes(LocalSLocEntryTable) +
+llvm::capacity_in_bytes(LoadedSLocEntryTable) +
+llvm::capacity_in_bytes(SLocEntryLoaded) +
+llvm::capacity_in_bytes(FileInfos);
if (OverriddenFilesInfo)
size += llvm::capacity_in_bytes(OverriddenFilesInfo->OverriddenFiles);
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index 0952244d037a77c..badd54987af18dd 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7944,9 +7944,10 @@ void ASTReader::PrintStats() {
std::fprintf(stderr, "*** AST File Statistics:\n");
unsigned NumTypesLoaded =
- TypesLoaded.size() - llvm::count(TypesLoaded, QualType());
+ TypesLoaded.size() - llvm::count(TypesLoaded.materialised(), QualType());
unsigned NumDeclsLoaded =
- DeclsLoaded.size() - llvm::count(DeclsLoaded, (Decl *)nullptr);
+ DeclsLoaded.size() -
+
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf updated https://github.com/llvm/llvm-project/pull/66430
>From 47392e5996cccada1d638495a9376b0430142c8c Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+...@users.noreply.github.com>
Date: Thu, 14 Sep 2023 21:58:21 +0200
Subject: [PATCH 1/8] Introduce PagedVector class
The goal of the class is to be an (almost) drop in replacement for
SmallVector and std::vector when those are presized and filled later,
as it happens in SourceManager and ASTReader.
By splitting the actual vector in pages of the same size and allocating
the pages only when they are needed, using this containers reduces the
memory usage by a factor 4 for the cases relevant to the ALICE
experiment ROOT / cling usage.
---
clang/include/clang/Basic/SourceManager.h | 3 +-
clang/include/clang/Serialization/ASTReader.h | 5 +-
clang/lib/Basic/SourceManager.cpp | 10 +-
clang/lib/Serialization/ASTReader.cpp | 5 +-
llvm/docs/ProgrammersManual.rst | 33 ++
llvm/include/llvm/ADT/PagedVector.h | 323 +
llvm/unittests/ADT/CMakeLists.txt | 1 +
llvm/unittests/ADT/PagedVectorTest.cpp| 342 ++
8 files changed, 712 insertions(+), 10 deletions(-)
create mode 100644 llvm/include/llvm/ADT/PagedVector.h
create mode 100644 llvm/unittests/ADT/PagedVectorTest.cpp
diff --git a/clang/include/clang/Basic/SourceManager.h
b/clang/include/clang/Basic/SourceManager.h
index 2f846502d6f3327..e37caa2252532f9 100644
--- a/clang/include/clang/Basic/SourceManager.h
+++ b/clang/include/clang/Basic/SourceManager.h
@@ -43,6 +43,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
+#include "llvm/ADT/PagedVector.h"
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
@@ -699,7 +700,7 @@ class SourceManager : public RefCountedBase {
///
/// Negative FileIDs are indexes into this table. To get from ID to an index,
/// use (-ID - 2).
- SmallVector LoadedSLocEntryTable;
+ llvm::PagedVector LoadedSLocEntryTable;
/// The starting offset of the next local SLocEntry.
///
diff --git a/clang/include/clang/Serialization/ASTReader.h
b/clang/include/clang/Serialization/ASTReader.h
index dc1eb21c27801fe..65e19c6e44cf571 100644
--- a/clang/include/clang/Serialization/ASTReader.h
+++ b/clang/include/clang/Serialization/ASTReader.h
@@ -38,6 +38,7 @@
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/MapVector.h"
+#include "llvm/ADT/PagedVector.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallPtrSet.h"
@@ -487,7 +488,7 @@ class ASTReader
///
/// When the pointer at index I is non-NULL, the type with
/// ID = (I + 1) << FastQual::Width has already been loaded
- std::vector TypesLoaded;
+ llvm::PagedVector TypesLoaded;
using GlobalTypeMapType =
ContinuousRangeMap;
@@ -501,7 +502,7 @@ class ASTReader
///
/// When the pointer at index I is non-NULL, the declaration with ID
/// = I + 1 has already been loaded.
- std::vector DeclsLoaded;
+ llvm::PagedVector DeclsLoaded;
using GlobalDeclMapType =
ContinuousRangeMap;
diff --git a/clang/lib/Basic/SourceManager.cpp
b/clang/lib/Basic/SourceManager.cpp
index 0521ac7b30339ab..7fa8b8096ac4931 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -2344,11 +2344,11 @@ SourceManager::MemoryBufferSizes
SourceManager::getMemoryBufferSizes() const {
}
size_t SourceManager::getDataStructureSizes() const {
- size_t size = llvm::capacity_in_bytes(MemBufferInfos)
-+ llvm::capacity_in_bytes(LocalSLocEntryTable)
-+ llvm::capacity_in_bytes(LoadedSLocEntryTable)
-+ llvm::capacity_in_bytes(SLocEntryLoaded)
-+ llvm::capacity_in_bytes(FileInfos);
+ size_t size = llvm::capacity_in_bytes(MemBufferInfos) +
+llvm::capacity_in_bytes(LocalSLocEntryTable) +
+llvm::capacity_in_bytes(LoadedSLocEntryTable) +
+llvm::capacity_in_bytes(SLocEntryLoaded) +
+llvm::capacity_in_bytes(FileInfos);
if (OverriddenFilesInfo)
size += llvm::capacity_in_bytes(OverriddenFilesInfo->OverriddenFiles);
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index 0952244d037a77c..badd54987af18dd 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7944,9 +7944,10 @@ void ASTReader::PrintStats() {
std::fprintf(stderr, "*** AST File Statistics:\n");
unsigned NumTypesLoaded =
- TypesLoaded.size() - llvm::count(TypesLoaded, QualType());
+ TypesLoaded.size() - llvm::count(TypesLoaded.materialised(), QualType());
unsigned NumDeclsLoaded =
- DeclsLoaded.size() - llvm::count(DeclsLoaded, (Decl *)nullptr);
+ DeclsLoaded.size() -
+
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf updated https://github.com/llvm/llvm-project/pull/66430
>From 47392e5996cccada1d638495a9376b0430142c8c Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+...@users.noreply.github.com>
Date: Thu, 14 Sep 2023 21:58:21 +0200
Subject: [PATCH 1/7] Introduce PagedVector class
The goal of the class is to be an (almost) drop in replacement for
SmallVector and std::vector when those are presized and filled later,
as it happens in SourceManager and ASTReader.
By splitting the actual vector in pages of the same size and allocating
the pages only when they are needed, using this containers reduces the
memory usage by a factor 4 for the cases relevant to the ALICE
experiment ROOT / cling usage.
---
clang/include/clang/Basic/SourceManager.h | 3 +-
clang/include/clang/Serialization/ASTReader.h | 5 +-
clang/lib/Basic/SourceManager.cpp | 10 +-
clang/lib/Serialization/ASTReader.cpp | 5 +-
llvm/docs/ProgrammersManual.rst | 33 ++
llvm/include/llvm/ADT/PagedVector.h | 323 +
llvm/unittests/ADT/CMakeLists.txt | 1 +
llvm/unittests/ADT/PagedVectorTest.cpp| 342 ++
8 files changed, 712 insertions(+), 10 deletions(-)
create mode 100644 llvm/include/llvm/ADT/PagedVector.h
create mode 100644 llvm/unittests/ADT/PagedVectorTest.cpp
diff --git a/clang/include/clang/Basic/SourceManager.h
b/clang/include/clang/Basic/SourceManager.h
index 2f846502d6f3327..e37caa2252532f9 100644
--- a/clang/include/clang/Basic/SourceManager.h
+++ b/clang/include/clang/Basic/SourceManager.h
@@ -43,6 +43,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
+#include "llvm/ADT/PagedVector.h"
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
@@ -699,7 +700,7 @@ class SourceManager : public RefCountedBase {
///
/// Negative FileIDs are indexes into this table. To get from ID to an index,
/// use (-ID - 2).
- SmallVector LoadedSLocEntryTable;
+ llvm::PagedVector LoadedSLocEntryTable;
/// The starting offset of the next local SLocEntry.
///
diff --git a/clang/include/clang/Serialization/ASTReader.h
b/clang/include/clang/Serialization/ASTReader.h
index dc1eb21c27801fe..65e19c6e44cf571 100644
--- a/clang/include/clang/Serialization/ASTReader.h
+++ b/clang/include/clang/Serialization/ASTReader.h
@@ -38,6 +38,7 @@
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/MapVector.h"
+#include "llvm/ADT/PagedVector.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallPtrSet.h"
@@ -487,7 +488,7 @@ class ASTReader
///
/// When the pointer at index I is non-NULL, the type with
/// ID = (I + 1) << FastQual::Width has already been loaded
- std::vector TypesLoaded;
+ llvm::PagedVector TypesLoaded;
using GlobalTypeMapType =
ContinuousRangeMap;
@@ -501,7 +502,7 @@ class ASTReader
///
/// When the pointer at index I is non-NULL, the declaration with ID
/// = I + 1 has already been loaded.
- std::vector DeclsLoaded;
+ llvm::PagedVector DeclsLoaded;
using GlobalDeclMapType =
ContinuousRangeMap;
diff --git a/clang/lib/Basic/SourceManager.cpp
b/clang/lib/Basic/SourceManager.cpp
index 0521ac7b30339ab..7fa8b8096ac4931 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -2344,11 +2344,11 @@ SourceManager::MemoryBufferSizes
SourceManager::getMemoryBufferSizes() const {
}
size_t SourceManager::getDataStructureSizes() const {
- size_t size = llvm::capacity_in_bytes(MemBufferInfos)
-+ llvm::capacity_in_bytes(LocalSLocEntryTable)
-+ llvm::capacity_in_bytes(LoadedSLocEntryTable)
-+ llvm::capacity_in_bytes(SLocEntryLoaded)
-+ llvm::capacity_in_bytes(FileInfos);
+ size_t size = llvm::capacity_in_bytes(MemBufferInfos) +
+llvm::capacity_in_bytes(LocalSLocEntryTable) +
+llvm::capacity_in_bytes(LoadedSLocEntryTable) +
+llvm::capacity_in_bytes(SLocEntryLoaded) +
+llvm::capacity_in_bytes(FileInfos);
if (OverriddenFilesInfo)
size += llvm::capacity_in_bytes(OverriddenFilesInfo->OverriddenFiles);
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index 0952244d037a77c..badd54987af18dd 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7944,9 +7944,10 @@ void ASTReader::PrintStats() {
std::fprintf(stderr, "*** AST File Statistics:\n");
unsigned NumTypesLoaded =
- TypesLoaded.size() - llvm::count(TypesLoaded, QualType());
+ TypesLoaded.size() - llvm::count(TypesLoaded.materialised(), QualType());
unsigned NumDeclsLoaded =
- DeclsLoaded.size() - llvm::count(DeclsLoaded, (Decl *)nullptr);
+ DeclsLoaded.size() -
+
[clang] Introduce paged vector (PR #66430)
https://github.com/ktf resolved https://github.com/llvm/llvm-project/pull/66430 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][InstrProf] Allow absolute path in fun.list of -fprofile-list= (PR #67519)
https://github.com/xgupta edited https://github.com/llvm/llvm-project/pull/67519 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang][Diagnostics] Highlight code snippets (PR #66514)
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?=
Message-ID:
In-Reply-To:
github-actions[bot] wrote:
:warning: C/C++ code formatter, clang-format found issues in your code.
:warning:
You can test this locally with the following command:
``bash
git-clang-format --diff 63086d6aa0af9bb7fc73c670d680191ae646f7d8
7eff8c1dbf616cc88b24626e35d3f076bb1b723e --
clang/include/clang/Frontend/CodeSnippetHighlighter.h
clang/lib/Frontend/CodeSnippetHighlighter.cpp
clang/include/clang/Frontend/TextDiagnostic.h
clang/lib/Frontend/TextDiagnostic.cpp
clang/lib/Frontend/TextDiagnosticPrinter.cpp
``
View the diff from clang-format here.
``diff
diff --git a/clang/lib/Frontend/CodeSnippetHighlighter.cpp
b/clang/lib/Frontend/CodeSnippetHighlighter.cpp
index 6a30ccabd0f2..357c4a82ed07 100644
--- a/clang/lib/Frontend/CodeSnippetHighlighter.cpp
+++ b/clang/lib/Frontend/CodeSnippetHighlighter.cpp
@@ -17,7 +17,8 @@ static constexpr raw_ostream::Colors KeywordColor =
raw_ostream::BLUE;
std::vector CodeSnippetHighlighter::highlightLine(
unsigned LineNumber, const Preprocessor *PP, const LangOptions ,
FileID FID, const SourceManager ) {
- std::chrono::steady_clock::time_point begin =
std::chrono::steady_clock::now();
+ std::chrono::steady_clock::time_point begin =
+ std::chrono::steady_clock::now();
if (!PP)
return {};
@@ -138,7 +139,6 @@ std::vector
CodeSnippetHighlighter::highlightLine(
}
#endif
-
while (Lines.size() <= LineNumber)
Lines.push_back({});
diff --git a/clang/lib/Frontend/TextDiagnostic.cpp
b/clang/lib/Frontend/TextDiagnostic.cpp
index 8c08d2665725..bedfabeeb65a 100644
--- a/clang/lib/Frontend/TextDiagnostic.cpp
+++ b/clang/lib/Frontend/TextDiagnostic.cpp
@@ -648,7 +648,8 @@ static bool printWordWrapped(raw_ostream , StringRef
Str, unsigned Columns,
}
TextDiagnostic::TextDiagnostic(raw_ostream , const LangOptions ,
- DiagnosticOptions *DiagOpts, const Preprocessor
*PP)
+ DiagnosticOptions *DiagOpts,
+ const Preprocessor *PP)
: DiagnosticRenderer(LangOpts, DiagOpts), OS(OS), PP(PP) {}
TextDiagnostic::~TextDiagnostic() {}
``
https://github.com/llvm/llvm-project/pull/66514
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][InstrProf] Allow absolute path in fun.list of -fprofile-list= (PR #67519)
https://github.com/xgupta updated
https://github.com/llvm/llvm-project/pull/67519
>From 9a38bc6f7322d641daec8d323b502cd09b721c53 Mon Sep 17 00:00:00 2001
From: Shivam Gupta
Date: Wed, 27 Sep 2023 11:18:47 +0530
Subject: [PATCH 1/3] [Clang][InstrProf] Allow absolute path in fun.list of
-fprofile-list=
---
clang/lib/Basic/ProfileList.cpp | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp
index 8fa16e2eb069a52..c3cb112cdf83922 100644
--- a/clang/lib/Basic/ProfileList.cpp
+++ b/clang/lib/Basic/ProfileList.cpp
@@ -139,9 +139,24 @@ std::optional
ProfileList::isFileExcluded(StringRef FileName,
CodeGenOptions::ProfileInstrKind Kind) const {
StringRef Section = getSectionName(Kind);
- // Check for "source:="
+
+ // Convert the input file path to its canonical (absolute) form
+ llvm::SmallString<128> CanonicalFileName(FileName);
+ llvm::sys::fs::make_absolute(CanonicalFileName);
+ llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName <<
"\n";
+
+ // Check for "source:=" using absolute path
+ if (auto V = inSection(Section, "source", CanonicalFileName))
+return V;
+ // If the absolute path didn't match, try the relative path (FileName)
if (auto V = inSection(Section, "source", FileName))
return V;
+
+ if (SCL->inSection(Section, "!src", CanonicalFileName))
+return Forbid;
+ if (SCL->inSection(Section, "src", CanonicalFileName))
+return Allow;
+ // If the absolute path didn't match, try the relative path (FileName)
if (SCL->inSection(Section, "!src", FileName))
return Forbid;
if (SCL->inSection(Section, "src", FileName))
>From 166e2ad0cb045c3f8970560d215d3cda95532876 Mon Sep 17 00:00:00 2001
From: Shivam Gupta
Date: Wed, 27 Sep 2023 11:36:34 +0530
Subject: [PATCH 2/3] clang-format
---
clang/lib/Basic/ProfileList.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp
index c3cb112cdf83922..ad90651dafc7ef9 100644
--- a/clang/lib/Basic/ProfileList.cpp
+++ b/clang/lib/Basic/ProfileList.cpp
@@ -143,7 +143,8 @@ ProfileList::isFileExcluded(StringRef FileName,
// Convert the input file path to its canonical (absolute) form
llvm::SmallString<128> CanonicalFileName(FileName);
llvm::sys::fs::make_absolute(CanonicalFileName);
- llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName <<
"\n";
+ llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName
+ << "\n";
// Check for "source:=" using absolute path
if (auto V = inSection(Section, "source", CanonicalFileName))
>From e801f8a9fe18847ea65e3cbb526e54fc7df5e135 Mon Sep 17 00:00:00 2001
From: Shivam Gupta
Date: Wed, 27 Sep 2023 11:37:48 +0530
Subject: [PATCH 3/3] Remove extra debug line
---
clang/lib/Basic/ProfileList.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp
index ad90651dafc7ef9..98b8cfabd313b01 100644
--- a/clang/lib/Basic/ProfileList.cpp
+++ b/clang/lib/Basic/ProfileList.cpp
@@ -143,8 +143,6 @@ ProfileList::isFileExcluded(StringRef FileName,
// Convert the input file path to its canonical (absolute) form
llvm::SmallString<128> CanonicalFileName(FileName);
llvm::sys::fs::make_absolute(CanonicalFileName);
- llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName
- << "\n";
// Check for "source:=" using absolute path
if (auto V = inSection(Section, "source", CanonicalFileName))
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][InstrProf] Allow absolute path in fun.list of -fprofile-list= (PR #67519)
https://github.com/xgupta updated
https://github.com/llvm/llvm-project/pull/67519
>From 9a38bc6f7322d641daec8d323b502cd09b721c53 Mon Sep 17 00:00:00 2001
From: Shivam Gupta
Date: Wed, 27 Sep 2023 11:18:47 +0530
Subject: [PATCH 1/2] [Clang][InstrProf] Allow absolute path in fun.list of
-fprofile-list=
---
clang/lib/Basic/ProfileList.cpp | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp
index 8fa16e2eb069a52..c3cb112cdf83922 100644
--- a/clang/lib/Basic/ProfileList.cpp
+++ b/clang/lib/Basic/ProfileList.cpp
@@ -139,9 +139,24 @@ std::optional
ProfileList::isFileExcluded(StringRef FileName,
CodeGenOptions::ProfileInstrKind Kind) const {
StringRef Section = getSectionName(Kind);
- // Check for "source:="
+
+ // Convert the input file path to its canonical (absolute) form
+ llvm::SmallString<128> CanonicalFileName(FileName);
+ llvm::sys::fs::make_absolute(CanonicalFileName);
+ llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName <<
"\n";
+
+ // Check for "source:=" using absolute path
+ if (auto V = inSection(Section, "source", CanonicalFileName))
+return V;
+ // If the absolute path didn't match, try the relative path (FileName)
if (auto V = inSection(Section, "source", FileName))
return V;
+
+ if (SCL->inSection(Section, "!src", CanonicalFileName))
+return Forbid;
+ if (SCL->inSection(Section, "src", CanonicalFileName))
+return Allow;
+ // If the absolute path didn't match, try the relative path (FileName)
if (SCL->inSection(Section, "!src", FileName))
return Forbid;
if (SCL->inSection(Section, "src", FileName))
>From 166e2ad0cb045c3f8970560d215d3cda95532876 Mon Sep 17 00:00:00 2001
From: Shivam Gupta
Date: Wed, 27 Sep 2023 11:36:34 +0530
Subject: [PATCH 2/2] clang-format
---
clang/lib/Basic/ProfileList.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp
index c3cb112cdf83922..ad90651dafc7ef9 100644
--- a/clang/lib/Basic/ProfileList.cpp
+++ b/clang/lib/Basic/ProfileList.cpp
@@ -143,7 +143,8 @@ ProfileList::isFileExcluded(StringRef FileName,
// Convert the input file path to its canonical (absolute) form
llvm::SmallString<128> CanonicalFileName(FileName);
llvm::sys::fs::make_absolute(CanonicalFileName);
- llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName <<
"\n";
+ llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName
+ << "\n";
// Check for "source:=" using absolute path
if (auto V = inSection(Section, "source", CanonicalFileName))
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang][Diagnostics] Highlight code snippets (PR #66514)
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?= ,
Timm =?utf-8?q?Bäder?=
Message-ID:
In-Reply-To:
https://github.com/tbaederr updated
https://github.com/llvm/llvm-project/pull/66514
>From 42e20781dda9ca269b6152f4e02377a32b70be1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?=
Date: Fri, 15 Sep 2023 15:51:39 +0200
Subject: [PATCH 1/8] [clang][Diagnostics] Highlight code snippets
Add some primitive syntax highlighting to our code snippet output.
---
.../clang/Frontend/CodeSnippetHighlighter.h | 46 +++
clang/include/clang/Frontend/TextDiagnostic.h | 2 +
clang/lib/Frontend/CMakeLists.txt | 1 +
clang/lib/Frontend/CodeSnippetHighlighter.cpp | 120 ++
clang/lib/Frontend/TextDiagnostic.cpp | 26
5 files changed, 195 insertions(+)
create mode 100644 clang/include/clang/Frontend/CodeSnippetHighlighter.h
create mode 100644 clang/lib/Frontend/CodeSnippetHighlighter.cpp
diff --git a/clang/include/clang/Frontend/CodeSnippetHighlighter.h
b/clang/include/clang/Frontend/CodeSnippetHighlighter.h
new file mode 100644
index 000..776954b59e2e1a8
--- /dev/null
+++ b/clang/include/clang/Frontend/CodeSnippetHighlighter.h
@@ -0,0 +1,46 @@
+//===--- CodeSnippetHighlighter.h - Code snippet highlighting ---*- C++
-*-===//
+//
+// 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
+//
+//===--===//
+
+#ifndef LLVM_CLANG_FRONTEND_CODESNIPPETHIGHLIGHTER_H
+#define LLVM_CLANG_FRONTEND_CODESNIPPETHIGHLIGHTER_H
+
+#include "clang/Basic/LangOptions.h"
+#include "llvm/ADT/SmallSet.h"
+#include "llvm/Support/raw_ostream.h"
+#include
+
+namespace clang {
+
+struct StyleRange {
+ unsigned Start;
+ unsigned End;
+ const enum llvm::raw_ostream::Colors c;
+};
+
+class CodeSnippetHighlighter final {
+public:
+ CodeSnippetHighlighter() = default;
+
+ /// Produce StyleRanges for the given line.
+ /// The returned vector contains non-overlapping style ranges. They are
sorted
+ /// from beginning of the line to the end.
+ std::vector highlightLine(llvm::StringRef SourceLine,
+const LangOptions );
+
+private:
+ bool Initialized = false;
+ /// Fills Keywords and Literals.
+ void ensureTokenData();
+
+ llvm::SmallSet Keywords;
+ llvm::SmallSet Literals;
+};
+
+} // namespace clang
+
+#endif
diff --git a/clang/include/clang/Frontend/TextDiagnostic.h
b/clang/include/clang/Frontend/TextDiagnostic.h
index 7eb0ab0cdc9bca8..59fd4d4f9408d48 100644
--- a/clang/include/clang/Frontend/TextDiagnostic.h
+++ b/clang/include/clang/Frontend/TextDiagnostic.h
@@ -15,6 +15,7 @@
#ifndef LLVM_CLANG_FRONTEND_TEXTDIAGNOSTIC_H
#define LLVM_CLANG_FRONTEND_TEXTDIAGNOSTIC_H
+#include "clang/Frontend/CodeSnippetHighlighter.h"
#include "clang/Frontend/DiagnosticRenderer.h"
namespace clang {
@@ -33,6 +34,7 @@ namespace clang {
/// printing coming out of libclang.
class TextDiagnostic : public DiagnosticRenderer {
raw_ostream
+ CodeSnippetHighlighter SnippetHighlighter;
public:
TextDiagnostic(raw_ostream ,
diff --git a/clang/lib/Frontend/CMakeLists.txt
b/clang/lib/Frontend/CMakeLists.txt
index 1e5f0a859dfd568..f3547f771593093 100644
--- a/clang/lib/Frontend/CMakeLists.txt
+++ b/clang/lib/Frontend/CMakeLists.txt
@@ -42,6 +42,7 @@ add_clang_library(clangFrontend
TextDiagnosticPrinter.cpp
VerifyDiagnosticConsumer.cpp
InterfaceStubFunctionsConsumer.cpp
+ CodeSnippetHighlighter.cpp
DEPENDS
ClangDriverOptions
diff --git a/clang/lib/Frontend/CodeSnippetHighlighter.cpp
b/clang/lib/Frontend/CodeSnippetHighlighter.cpp
new file mode 100644
index 000..829a533ad2692e5
--- /dev/null
+++ b/clang/lib/Frontend/CodeSnippetHighlighter.cpp
@@ -0,0 +1,120 @@
+
+#include "clang/Frontend/CodeSnippetHighlighter.h"
+#include "clang/Basic/DiagnosticOptions.h"
+#include "clang/Basic/SourceManager.h"
+#include "clang/Lex/Lexer.h"
+#include "llvm/Support/raw_ostream.h"
+
+using namespace clang;
+
+void CodeSnippetHighlighter::ensureTokenData() {
+ if (Initialized)
+return;
+
+ // List of keywords, literals and types we want to highlight.
+ // These are best-effort, as is everything we do wrt. highlighting.
+ Keywords.insert("_Static_assert");
+ Keywords.insert("auto");
+ Keywords.insert("concept");
+ Keywords.insert("const");
+ Keywords.insert("consteval");
+ Keywords.insert("constexpr");
+ Keywords.insert("delete");
+ Keywords.insert("do");
+ Keywords.insert("else");
+ Keywords.insert("final");
+ Keywords.insert("for");
+ Keywords.insert("if");
+ Keywords.insert("mutable");
+ Keywords.insert("namespace");
+ Keywords.insert("new");
+ Keywords.insert("private");
+
[clang] [Clang][InstrProf] Allow absolute path in fun.list of -fprofile-list= (PR #67519)
github-actions[bot] wrote: :warning: C/C++ code formatter, clang-format found issues in your code. :warning: You can test this locally with the following command: ``bash git-clang-format --diff 63086d6aa0af9bb7fc73c670d680191ae646f7d8 1968e1f2a131b6ba348501a76983e8df337088f5 -- clang/lib/Basic/ProfileList.cpp `` View the diff from clang-format here. ``diff diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp index c3cb112cd..ad90651da 100644 --- a/clang/lib/Basic/ProfileList.cpp +++ b/clang/lib/Basic/ProfileList.cpp @@ -143,7 +143,8 @@ ProfileList::isFileExcluded(StringRef FileName, // Convert the input file path to its canonical (absolute) form llvm::SmallString<128> CanonicalFileName(FileName); llvm::sys::fs::make_absolute(CanonicalFileName); - llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName << "\n"; + llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName + << "\n"; // Check for "source:=" using absolute path if (auto V = inSection(Section, "source", CanonicalFileName)) `` https://github.com/llvm/llvm-project/pull/67519 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [PowerPC] Support local-dynamic TLS relocation on AIX (PR #66316)
@@ -6,6 +6,6 @@
#endif
static __thread int y __attribute((tls_model("global-dynamic"))); // no-warning
-static __thread int y __attribute((tls_model("local-dynamic"))); //
expected-error {{TLS model 'local-dynamic' is not yet supported on AIX}}
+static __thread int y __attribute((tls_model("local-dynamic"))); //
expected-no-diagnostics
orcguru wrote:
Thank you for asking. I did try to change it to "no-warning", however I got
error message from llvm-lit complaining that since there is no diagnostic
message anymore, we should "expected-no-diagnostics". So I did this change to
make llvm-lit happy. If there is other formal/better setting, I will be happy
to make the change.
https://github.com/llvm/llvm-project/pull/66316
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang][InstrProf] Allow absolute path in fun.list of -fprofile-list= (PR #67519)
https://github.com/xgupta created
https://github.com/llvm/llvm-project/pull/67519
None
>From 9a38bc6f7322d641daec8d323b502cd09b721c53 Mon Sep 17 00:00:00 2001
From: Shivam Gupta
Date: Wed, 27 Sep 2023 11:18:47 +0530
Subject: [PATCH] [Clang][InstrProf] Allow absolute path in fun.list of
-fprofile-list=
---
clang/lib/Basic/ProfileList.cpp | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Basic/ProfileList.cpp b/clang/lib/Basic/ProfileList.cpp
index 8fa16e2eb069a52..c3cb112cdf83922 100644
--- a/clang/lib/Basic/ProfileList.cpp
+++ b/clang/lib/Basic/ProfileList.cpp
@@ -139,9 +139,24 @@ std::optional
ProfileList::isFileExcluded(StringRef FileName,
CodeGenOptions::ProfileInstrKind Kind) const {
StringRef Section = getSectionName(Kind);
- // Check for "source:="
+
+ // Convert the input file path to its canonical (absolute) form
+ llvm::SmallString<128> CanonicalFileName(FileName);
+ llvm::sys::fs::make_absolute(CanonicalFileName);
+ llvm::dbgs() << "Parsing -fprofile-list option: " << CanonicalFileName <<
"\n";
+
+ // Check for "source:=" using absolute path
+ if (auto V = inSection(Section, "source", CanonicalFileName))
+return V;
+ // If the absolute path didn't match, try the relative path (FileName)
if (auto V = inSection(Section, "source", FileName))
return V;
+
+ if (SCL->inSection(Section, "!src", CanonicalFileName))
+return Forbid;
+ if (SCL->inSection(Section, "src", CanonicalFileName))
+return Allow;
+ // If the absolute path didn't match, try the relative path (FileName)
if (SCL->inSection(Section, "!src", FileName))
return Forbid;
if (SCL->inSection(Section, "src", FileName))
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
