08ece0c9a0
PS1 regenerates the Bazel files. Use it as the base change when
comparing patchsets.
IWYU seems to do a good job of working with MyFile.cpp and
MyFile.h, but if there is just a MyHeader.h, it doesn't always
seem to throw errors if the includes aren't correct. This was
observed with include/sksl/DSL.h This might be due to the fact
that headers are not compiled on their own, so they are never
sent directly to the IWYU binary.
This change sets enforce_iwyu_on_package() on the all sksl
packages and then fixes the includes until all those checks
are happy. There were a few files that needed fixes outside
of the sksl folder. Examples include:
- src/gpu/effects/GrConvexPolyEffect.cpp
- tests/SkSLDSLTest.cpp
To really enforce this, we need to add a CI/CQ job that runs
bazel build //example:hello_world_gl --config=clang \
--sandbox_base=/dev/shm --features skia_enforce_iwyu
If that failed, a dev could make the changes described in
the logs and/or run the command locally to see those
prescribed fixes.
I had to add several entries to toolchain/IWYU_mapping.imp
in order to fix some private includes and other atypical
choices. I tried adding a rule there to allow inclusion of
SkTypes.h to make sure defines like SK_SUPPORT_GPU, but
could not get it to work for all cases, so I deferred to
using the IWYU pragma: keep (e.g. SkSLPipelineStageCodeGenerator.h)
Change-Id: I4c3e536d8e69ff7ff2d26fe61a525a6c2e80db06
Bug: skia:13052
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522256
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
79 lines
1.7 KiB
C++
79 lines
1.7 KiB
C++
/*
|
|
* Copyright 2021 Google LLC.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SKSL_ERROR_REPORTER
|
|
#define SKSL_ERROR_REPORTER
|
|
|
|
#include "include/core/SkTypes.h"
|
|
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <vector>
|
|
|
|
namespace SkSL {
|
|
|
|
class Position;
|
|
|
|
/**
|
|
* Class which is notified in the event of an error.
|
|
*/
|
|
class ErrorReporter {
|
|
public:
|
|
ErrorReporter() {}
|
|
|
|
virtual ~ErrorReporter() {
|
|
SkASSERT(fPendingErrors.empty());
|
|
}
|
|
|
|
void error(std::string_view msg, Position position);
|
|
|
|
/**
|
|
* Reports an error message at the given line of the source text. Errors reported
|
|
* with a line of -1 will be queued until line number information can be determined.
|
|
*/
|
|
void error(Position pos, std::string_view msg);
|
|
|
|
std::string_view source() const { return fSource; }
|
|
|
|
void setSource(std::string_view source) { fSource = source; }
|
|
|
|
void reportPendingErrors(Position pos);
|
|
|
|
int errorCount() const {
|
|
return fErrorCount;
|
|
}
|
|
|
|
void resetErrorCount() {
|
|
fErrorCount = 0;
|
|
}
|
|
|
|
protected:
|
|
/**
|
|
* Called when an error is reported.
|
|
*/
|
|
virtual void handleError(std::string_view msg, Position position) = 0;
|
|
|
|
private:
|
|
Position position(int offset) const;
|
|
|
|
std::string_view fSource;
|
|
std::vector<std::string> fPendingErrors;
|
|
int fErrorCount = 0;
|
|
};
|
|
|
|
/**
|
|
* Error reporter for tests that need an SkSL context; aborts immediately if an error is reported.
|
|
*/
|
|
class TestingOnly_AbortErrorReporter : public ErrorReporter {
|
|
public:
|
|
void handleError(std::string_view msg, Position pos) override;
|
|
};
|
|
|
|
} // namespace SkSL
|
|
|
|
#endif
|