34c7e11492
This reverts commit 3a4e19da8e.
TBR=brianosman@google.com, johnstiles@google.com
Change-Id: I5ae97aba2df5b9c3b3dcca8e30da4e5ce9009109
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376117
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
127 lines
3.7 KiB
C++
127 lines
3.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.
|
|
*/
|
|
|
|
/*****
|
|
* This class tests that errors are reported at the correct line numbers, so note that shifting the
|
|
* code up or down will break tests.
|
|
*****/
|
|
#include "src/gpu/GrDirectContextPriv.h"
|
|
#include "src/gpu/GrGpu.h"
|
|
#include "src/sksl/SkSLIRGenerator.h"
|
|
#include "src/sksl/dsl/DSL.h"
|
|
#include "src/sksl/dsl/priv/DSLWriter.h"
|
|
#include "src/sksl/ir/SkSLIRNode.h"
|
|
|
|
#include "tests/Test.h"
|
|
|
|
#include <limits>
|
|
|
|
using namespace SkSL::dsl;
|
|
|
|
#if defined(__GNUC__) || defined(__clang__)
|
|
|
|
class ExpectErrorLineNumber : public ErrorHandler {
|
|
public:
|
|
ExpectErrorLineNumber(skiatest::Reporter* reporter, const char* msg, int line)
|
|
: fMsg(msg)
|
|
, fLine(line)
|
|
, fReporter(reporter) {
|
|
SetErrorHandler(this);
|
|
}
|
|
|
|
~ExpectErrorLineNumber() override {
|
|
REPORTER_ASSERT(fReporter, !fMsg);
|
|
SetErrorHandler(nullptr);
|
|
}
|
|
|
|
void handleError(const char* msg, PositionInfo* pos) override {
|
|
REPORTER_ASSERT(fReporter, !strcmp(msg, fMsg),
|
|
"Error mismatch: expected:\n%sbut received:\n%s", fMsg, msg);
|
|
REPORTER_ASSERT(fReporter, pos);
|
|
REPORTER_ASSERT(fReporter, pos->line() == fLine,
|
|
"Line number mismatch: expected %d, but received %d\n", fLine, pos->line());
|
|
fMsg = nullptr;
|
|
}
|
|
|
|
private:
|
|
const char* fMsg;
|
|
int fLine;
|
|
skiatest::Reporter* fReporter;
|
|
};
|
|
|
|
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLErrorLineNumbers, r, ctxInfo) {
|
|
Start(ctxInfo.directContext()->priv().getGpu()->shaderCompiler());
|
|
{
|
|
ExpectErrorLineNumber error(r,
|
|
"error: type mismatch: '+' cannot operate on 'float', 'bool'\n",
|
|
62);
|
|
DSLExpression x = (Float(1) + true);
|
|
}
|
|
|
|
{
|
|
Var a(kBool);
|
|
ExpectErrorLineNumber error(r,
|
|
"error: type mismatch: '=' cannot operate on 'bool', 'float'\n",
|
|
70);
|
|
DSLExpression x = (a = 5.0f);
|
|
}
|
|
|
|
{
|
|
Var a(Array(kInt, 5));
|
|
ExpectErrorLineNumber error(r,
|
|
"error: expected 'int', but found 'bool'\n",
|
|
78);
|
|
DSLExpression x = (a[true]);
|
|
}
|
|
|
|
{
|
|
Var a(Array(kInt, 5));
|
|
ExpectErrorLineNumber error(r,
|
|
"error: '++' cannot operate on 'int[5]'\n",
|
|
86);
|
|
DSLExpression x = ++a;
|
|
}
|
|
|
|
{
|
|
ExpectErrorLineNumber error(r,
|
|
"error: expected 'bool', but found 'int'\n",
|
|
93);
|
|
DSLStatement x = Do(Discard(), 5);
|
|
}
|
|
|
|
{
|
|
ExpectErrorLineNumber error(r,
|
|
"error: expected 'bool', but found 'int'\n",
|
|
100);
|
|
DSLStatement x = For(DSLStatement(), 5, DSLExpression(), DSLStatement());
|
|
}
|
|
|
|
{
|
|
ExpectErrorLineNumber error(r,
|
|
"error: expected 'bool', but found 'int'\n",
|
|
107);
|
|
DSLStatement x = If(5, Discard());
|
|
}
|
|
|
|
{
|
|
ExpectErrorLineNumber error(r,
|
|
"error: expected 'bool', but found 'int'\n",
|
|
114);
|
|
DSLStatement x = While(5, Discard());
|
|
}
|
|
|
|
{
|
|
ExpectErrorLineNumber error(r,
|
|
"error: no match for abs(bool)\n",
|
|
121);
|
|
DSLStatement x = Abs(true);
|
|
}
|
|
End();
|
|
}
|
|
|
|
#endif // defined(__GNUC__) || defined(__clang__)
|