Revert "fix ubsan warning"
authorBrian Osman <brianosman@google.com>
Mon, 22 May 2017 19:24:13 +0000 (19:24 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Mon, 22 May 2017 19:24:26 +0000 (19:24 +0000)
This reverts commit 4d1c5d676eb32ed304ee4aa410cebbc6467b59c2.

Reason for revert: Valgrind requires reverting ancestor commit.

Original change's description:
> fix ubsan warning
>
> CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN
>
> Change-Id: Ic8c5d95fdb899cb5293b2bc456f61b1637ec3aed
> Reviewed-on: https://skia-review.googlesource.com/17489
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
>

TBR=mtklein@chromium.org,herb@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN

Change-Id: Idbfdc4773756aa475829c1421d10d6f341081d7b
Reviewed-on: https://skia-review.googlesource.com/17521
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/jumper/SkJumper.cpp

index 8daf29e..0e184b9 100644 (file)
@@ -188,9 +188,6 @@ static void build_pipeline(const SkRasterPipeline::Stage* stages, int nstages,
 }
 
 void SkRasterPipeline::run(size_t x, size_t n) const {
-    if (fStages.empty()) {
-        return;
-    }
     gChooseEngineOnce([]{ gPlatform = choose_engine(); });
 
     SkAutoSTMalloc<64, void*> program(2*fStages.size() + 1);
@@ -207,9 +204,6 @@ void SkRasterPipeline::run(size_t x, size_t n) const {
 }
 
 std::function<void(size_t, size_t)> SkRasterPipeline::compile(SkArenaAlloc* alloc) const {
-    if (fStages.empty()) {
-        return [](size_t, size_t) {};
-    }
     gChooseEngineOnce([]{ gPlatform = choose_engine(); });
 
     void** platform = alloc->makeArray<void*>(2*fStages.size() + 1);