AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove mentions of -Wweak-template-vtables

Browse Source 
the Clang warning is being removed, see bug.

Bug: chromium:1264351, chromium:1294786
Change-Id: I206f1c891f722cd906fd357176c9f68778e0861f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/464616
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Hans Wennborg 2022-02-07 16:13:08 +01:00 committed by SkCQ
parent 26e1285932
commit 55f6115f80
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gn/skia/BUILD.gn
View File

@ -412,6 +412,10 @@ config("warnings") {
"-Weverything", "-Weverything",
"-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' "-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs'
# warnings. # warnings.
# This was deprecated in Clang 14 and removed in Clang 15. It might still
# fire with older Clangs, so disable it explicitly.
"-Wno-weak-template-vtables",
] ]
if (target_cpu == "arm" && is_ios) { if (target_cpu == "arm" && is_ios) {

8
src/sksl/analysis/SkSLProgramVisitor.h
View File

@ -55,15 +55,7 @@ struct ProgramVisitorTypes {
using UniquePtrStatement = const std::unique_ptr<SkSL::Statement>; using UniquePtrStatement = const std::unique_ptr<SkSL::Statement>;
}; };
// Squelch bogus Clang warning about template vtables: https://bugs.llvm.org/show_bug.cgi?id=18733
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wweak-template-vtables"
#endif
extern template class TProgramVisitor<ProgramVisitorTypes>; extern template class TProgramVisitor<ProgramVisitorTypes>;
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
class ProgramVisitor : public TProgramVisitor<ProgramVisitorTypes> { class ProgramVisitor : public TProgramVisitor<ProgramVisitorTypes> {
public: public:

8
src/sksl/transform/SkSLProgramWriter.h
View File

@ -21,15 +21,7 @@ struct ProgramWriterTypes {
using UniquePtrStatement = std::unique_ptr<SkSL::Statement>; using UniquePtrStatement = std::unique_ptr<SkSL::Statement>;
}; };
// Squelch bogus Clang warning about template vtables: https://bugs.llvm.org/show_bug.cgi?id=18733
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wweak-template-vtables"
#endif
extern template class TProgramVisitor<ProgramWriterTypes>; extern template class TProgramVisitor<ProgramWriterTypes>;
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
class ProgramWriter : public TProgramVisitor<ProgramWriterTypes> { class ProgramWriter : public TProgramVisitor<ProgramWriterTypes> {
public: public: