diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-06-12 11:05:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-12 19:16:03 +0000 |
| commit | d9d33c33dee064da260301faa313703e465d44c5 (patch) | |
| tree | f2e9a592acde1715d71381d8ff7c97fdaf58edac /src/sksl/SkSLCFGGenerator.cpp | |
| parent | 22be4c4801f957f2820b9001b02b892f4b87a157 (diff) | |
renamed SkSL's assert macros
Since SkSL needs to run outside of Skia, it was originally using its
own ASSERT macro, which mapped to SkASSERT when inside of Skia. This is
causing conflicts with one or two other ASSERT macros defined around
Skia, so to avoid that I am switching SkSL over to just use Skia's
standard naming for these macros.
Bug: skia:
Change-Id: I115435d7282da03d076c6080f7b13d1972b9eb9f
Reviewed-on: https://skia-review.googlesource.com/134322
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLCFGGenerator.cpp')
| -rw-r--r-- | src/sksl/SkSLCFGGenerator.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sksl/SkSLCFGGenerator.cpp b/src/sksl/SkSLCFGGenerator.cpp index 852f48d71d..c267058a79 100644 --- a/src/sksl/SkSLCFGGenerator.cpp +++ b/src/sksl/SkSLCFGGenerator.cpp @@ -89,7 +89,7 @@ bool BasicBlock::tryRemoveExpressionBefore(std::vector<BasicBlock::Node>::iterat } bool result; if ((*iter)->fKind == BasicBlock::Node::kExpression_Kind) { - ASSERT((*iter)->expression()->get() != e); + SkASSERT((*iter)->expression()->get() != e); Expression* old = (*iter)->expression()->get(); do { if ((*iter) == fNodes.begin()) { @@ -101,7 +101,7 @@ bool BasicBlock::tryRemoveExpressionBefore(std::vector<BasicBlock::Node>::iterat result = this->tryRemoveExpression(iter); while ((*iter)->fKind != BasicBlock::Node::kExpression_Kind || (*iter)->expression()->get() != old) { - ASSERT(*iter != fNodes.end()); + SkASSERT(*iter != fNodes.end()); ++(*iter); } } else { @@ -116,7 +116,7 @@ bool BasicBlock::tryRemoveExpressionBefore(std::vector<BasicBlock::Node>::iterat result = this->tryRemoveExpression(iter); while ((*iter)->fKind != BasicBlock::Node::kStatement_Kind || (*iter)->statement()->get() != old) { - ASSERT(*iter != fNodes.end()); + SkASSERT(*iter != fNodes.end()); ++(*iter); } } @@ -166,7 +166,7 @@ bool BasicBlock::tryRemoveExpression(std::vector<BasicBlock::Node>::iterator* it if (!this->tryRemoveExpressionBefore(iter, b->fRight.get())) { return false; } - ASSERT((*iter)->expression()->get() == expr); + SkASSERT((*iter)->expression()->get() == expr); *iter = fNodes.erase(*iter); return true; } @@ -207,7 +207,7 @@ bool BasicBlock::tryRemoveExpression(std::vector<BasicBlock::Node>::iterator* it if (!this->tryRemoveExpressionBefore(iter, arg.get())) { return false; } - ASSERT((*iter)->expression()->get() == expr); + SkASSERT((*iter)->expression()->get() == expr); } *iter = fNodes.erase(*iter); return true; @@ -218,7 +218,7 @@ bool BasicBlock::tryRemoveExpression(std::vector<BasicBlock::Node>::iterator* it if (!this->tryRemoveExpressionBefore(iter, arg.get())) { return false; } - ASSERT((*iter)->expression()->get() == expr); + SkASSERT((*iter)->expression()->get() == expr); } *iter = fNodes.erase(*iter); return true; @@ -292,7 +292,7 @@ bool BasicBlock::tryInsertExpression(std::vector<BasicBlock::Node>::iterator* it } void CFGGenerator::addExpression(CFG& cfg, std::unique_ptr<Expression>* e, bool constantPropagate) { - ASSERT(e); + SkASSERT(e); switch ((*e)->fKind) { case Expression::kBinary_Kind: { BinaryExpression* b = (BinaryExpression*) e->get(); @@ -415,7 +415,7 @@ void CFGGenerator::addExpression(CFG& cfg, std::unique_ptr<Expression>* e, bool case Expression::kFunctionReference_Kind: // fall through case Expression::kTypeReference_Kind: // fall through case Expression::kDefined_Kind: - ASSERT(false); + SkASSERT(false); break; } } @@ -445,7 +445,7 @@ void CFGGenerator::addLValue(CFG& cfg, std::unique_ptr<Expression>* e) { break; default: // not an lvalue, can't happen - ASSERT(false); + SkASSERT(false); break; } } |