Replace SK_DEBUG-wrapped ABORT calls with SkDEBUGFAILF.

johnstiles-google · johnstiles-google · commit eada7bc4e95b · 2021-02-02T22:47:04.000Z
Change-Id: I4b11aaa8299a4aa2753097c26936e0176189f1db Reviewed-on: https://skia-review.googlesource.com/c/skia/+/364641 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/sksl/SkSLCFGGenerator.cpp b/src/sksl/SkSLCFGGenerator.cpp
@@ -186,9 +186,7 @@ bool BasicBlock::tryRemoveLValueBefore(std::vector<BasicBlock::Node>::iterator*
             return this->tryRemoveLValueBefore(iter, ternary.ifFalse().get());
         }
         default:
-#ifdef SK_DEBUG
-            ABORT("invalid lvalue: %s\n", lvalue->description().c_str());
-#endif
+            SkDEBUGFAILF("invalid lvalue: %s\n", lvalue->description().c_str());
             return false;
     }
 }
@@ -287,9 +285,7 @@ bool BasicBlock::tryRemoveExpression(std::vector<BasicBlock::Node>::iterator* it
             *iter = fNodes.erase(*iter);
             return true;
         default:
-#ifdef SK_DEBUG
-            ABORT("unhandled expression: %s\n", expr->description().c_str());
-#endif
+            SkDEBUGFAILF("unhandled expression: %s\n", expr->description().c_str());
             return false;
     }
 }
@@ -655,9 +651,7 @@ void CFGGenerator::addStatement(CFG& cfg, std::unique_ptr<Statement>* s) {
         case Statement::Kind::kNop:
             break;
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported statement: %s\n", (*s)->description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported statement: %s\n", (*s)->description().c_str());
             break;
     }
 }
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
@@ -576,9 +576,7 @@ static bool is_dead(const Expression& lvalue, ProgramUsage* usage) {
                    is_dead(*t.ifFalse(), usage);
         }
         default:
-#ifdef SK_DEBUG
-            ABORT("invalid lvalue: %s\n", lvalue.description().c_str());
-#endif
+            SkDEBUGFAILF("invalid lvalue: %s\n", lvalue.description().c_str());
             return false;
     }
 }
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -224,9 +224,7 @@ void GLSLCodeGenerator::writeExpression(const Expression& expr, Precedence paren
             this->writeIndexExpression(expr.as<IndexExpression>());
             break;
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported expression: %s", expr.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported expression: %s", expr.description().c_str());
             break;
     }
 }
@@ -1312,9 +1310,7 @@ void GLSLCodeGenerator::writeStatement(const Statement& s) {
             this->write(";");
             break;
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported statement: %s", s.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported statement: %s", s.description().c_str());
             break;
     }
 }
diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
@@ -1568,9 +1568,7 @@ std::unique_ptr<Expression> IRGenerator::convertExpression(const ASTNode& expr)
         case ASTNode::Kind::kTernary:
             return this->convertTernaryExpression(expr);
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported expression: %s\n", expr.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported expression: %s\n", expr.description().c_str());
             return nullptr;
     }
 }
@@ -3103,9 +3101,7 @@ IRGenerator::IRBundle IRGenerator::convertProgram(
                 break;
             }
             default:
-#ifdef SK_DEBUG
-                ABORT("unsupported declaration: %s\n", decl.description().c_str());
-#endif
+                SkDEBUGFAILF("unsupported declaration: %s\n", decl.description().c_str());
                 break;
         }
     }
diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -218,9 +218,7 @@ void MetalCodeGenerator::writeExpression(const Expression& expr, Precedence pare
             this->writeIndexExpression(expr.as<IndexExpression>());
             break;
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported expression: %s", expr.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported expression: %s", expr.description().c_str());
             break;
     }
 }
@@ -1784,9 +1782,7 @@ void MetalCodeGenerator::writeStatement(const Statement& s) {
             this->write(";");
             break;
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported statement: %s", s.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported statement: %s", s.description().c_str());
             break;
     }
 }
@@ -2218,9 +2214,7 @@ void MetalCodeGenerator::writeProgramElement(const ProgramElement& e) {
         case ProgramElement::Kind::kEnum:
             break;
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported program element: %s\n", e.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported program element: %s\n", e.description().c_str());
             break;
     }
 }
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -598,9 +598,7 @@ SpvId SPIRVCodeGenerator::getType(const Type& rawType, const MemoryLayout& layou
                 if (type == *fContext.fTypes.fVoid) {
                     this->writeInstruction(SpvOpTypeVoid, result, fConstantBuffer);
                 } else {
-#ifdef SK_DEBUG
-                    ABORT("invalid type: %s", type.description().c_str());
-#endif
+                    SkDEBUGFAILF("invalid type: %s", type.description().c_str());
                 }
         }
         fTypeMap[key] = result;
@@ -723,9 +721,7 @@ SpvId SPIRVCodeGenerator::writeExpression(const Expression& expr, OutputStream&
         case Expression::Kind::kIndex:
             return this->writeIndexExpression(expr.as<IndexExpression>(), out);
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported expression: %s", expr.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported expression: %s", expr.description().c_str());
             break;
     }
     return -1;
@@ -2577,9 +2573,7 @@ SpvId SPIRVCodeGenerator::writePrefixExpression(const PrefixExpression& p, Outpu
         } else if (is_signed(fContext, type)) {
             this->writeInstruction(SpvOpSNegate, typeId, result, expr, out);
         } else {
-#ifdef SK_DEBUG
-            ABORT("unsupported prefix expression %s", p.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported prefix expression %s", p.description().c_str());
         }
         this->writePrecisionModifier(type, result);
         return result;
@@ -2618,9 +2612,7 @@ SpvId SPIRVCodeGenerator::writePrefixExpression(const PrefixExpression& p, Outpu
             return result;
         }
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported prefix expression: %s", p.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported prefix expression: %s", p.description().c_str());
             return -1;
     }
 }
@@ -2644,9 +2636,7 @@ SpvId SPIRVCodeGenerator::writePostfixExpression(const PostfixExpression& p, Out
             return result;
         }
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported postfix expression %s", p.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported postfix expression %s", p.description().c_str());
             return -1;
     }
 }
@@ -3028,9 +3018,7 @@ void SPIRVCodeGenerator::writeStatement(const Statement& s, OutputStream& out) {
             this->writeInstruction(SpvOpKill, out);
             break;
         default:
-#ifdef SK_DEBUG
-            ABORT("unsupported statement: %s", s.description().c_str());
-#endif
+            SkDEBUGFAILF("unsupported statement: %s", s.description().c_str());
             break;
     }
 }
diff --git a/src/sksl/ir/SkSLType.cpp b/src/sksl/ir/SkSLType.cpp
@@ -204,9 +204,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
             default: ABORT("unsupported row count (%d)", rows);
         }
     }
-#ifdef SK_DEBUG
-    ABORT("unsupported toCompound type %s", this->description().c_str());
-#endif
+    SkDEBUGFAILF("unsupported toCompound type %s", this->description().c_str());
     return *context.fTypes.fVoid;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,7 @@ bool BasicBlock::tryRemoveLValueBefore(std::vector<BasicBlock::Node>::iterator*`
`186`	`186`	`return this->tryRemoveLValueBefore(iter, ternary.ifFalse().get());`
`187`	`187`	`}`
`188`	`188`	`default:`
`189`		`-#ifdef SK_DEBUG`
`190`		`- ABORT("invalid lvalue: %s\n", lvalue->description().c_str());`
`191`		`-#endif`
	`189`	`+ SkDEBUGFAILF("invalid lvalue: %s\n", lvalue->description().c_str());`
`192`	`190`	`return false;`
`193`	`191`	`}`
`194`	`192`	`}`
`@@ -287,9 +285,7 @@ bool BasicBlock::tryRemoveExpression(std::vector<BasicBlock::Node>::iterator* it`
`287`	`285`	`iter = fNodes.erase(iter);`
`288`	`286`	`return true;`
`289`	`287`	`default:`
`290`		`-#ifdef SK_DEBUG`
`291`		`- ABORT("unhandled expression: %s\n", expr->description().c_str());`
`292`		`-#endif`
	`288`	`+ SkDEBUGFAILF("unhandled expression: %s\n", expr->description().c_str());`
`293`	`289`	`return false;`
`294`	`290`	`}`
`295`	`291`	`}`
`@@ -655,9 +651,7 @@ void CFGGenerator::addStatement(CFG& cfg, std::unique_ptr<Statement>* s) {`
`655`	`651`	`case Statement::Kind::kNop:`
`656`	`652`	`break;`
`657`	`653`	`default:`
`658`		`-#ifdef SK_DEBUG`
`659`		`- ABORT("unsupported statement: %s\n", (*s)->description().c_str());`
`660`		`-#endif`
	`654`	`+ SkDEBUGFAILF("unsupported statement: %s\n", (*s)->description().c_str());`
`661`	`655`	`break;`
`662`	`656`	`}`
`663`	`657`	`}`
Original file line number	Diff line number	Diff line change
`@@ -576,9 +576,7 @@ static bool is_dead(const Expression& lvalue, ProgramUsage* usage) {`
`576`	`576`	`is_dead(*t.ifFalse(), usage);`
`577`	`577`	`}`
`578`	`578`	`default:`
`579`		`-#ifdef SK_DEBUG`
`580`		`- ABORT("invalid lvalue: %s\n", lvalue.description().c_str());`
`581`		`-#endif`
	`579`	`+ SkDEBUGFAILF("invalid lvalue: %s\n", lvalue.description().c_str());`
`582`	`580`	`return false;`
`583`	`581`	`}`
`584`	`582`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,9 +224,7 @@ void GLSLCodeGenerator::writeExpression(const Expression& expr, Precedence paren`
`224`	`224`	`this->writeIndexExpression(expr.as<IndexExpression>());`
`225`	`225`	`break;`
`226`	`226`	`default:`
`227`		`-#ifdef SK_DEBUG`
`228`		`- ABORT("unsupported expression: %s", expr.description().c_str());`
`229`		`-#endif`
	`227`	`+ SkDEBUGFAILF("unsupported expression: %s", expr.description().c_str());`
`230`	`228`	`break;`
`231`	`229`	`}`
`232`	`230`	`}`
`@@ -1312,9 +1310,7 @@ void GLSLCodeGenerator::writeStatement(const Statement& s) {`
`1312`	`1310`	`this->write(";");`
`1313`	`1311`	`break;`
`1314`	`1312`	`default:`
`1315`		`-#ifdef SK_DEBUG`
`1316`		`- ABORT("unsupported statement: %s", s.description().c_str());`
`1317`		`-#endif`
	`1313`	`+ SkDEBUGFAILF("unsupported statement: %s", s.description().c_str());`
`1318`	`1314`	`break;`
`1319`	`1315`	`}`
`1320`	`1316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1568,9 +1568,7 @@ std::unique_ptr<Expression> IRGenerator::convertExpression(const ASTNode& expr)`
`1568`	`1568`	`case ASTNode::Kind::kTernary:`
`1569`	`1569`	`return this->convertTernaryExpression(expr);`
`1570`	`1570`	`default:`
`1571`		`-#ifdef SK_DEBUG`
`1572`		`- ABORT("unsupported expression: %s\n", expr.description().c_str());`
`1573`		`-#endif`
	`1571`	`+ SkDEBUGFAILF("unsupported expression: %s\n", expr.description().c_str());`
`1574`	`1572`	`return nullptr;`
`1575`	`1573`	`}`
`1576`	`1574`	`}`
`@@ -3103,9 +3101,7 @@ IRGenerator::IRBundle IRGenerator::convertProgram(`
`3103`	`3101`	`break;`
`3104`	`3102`	`}`
`3105`	`3103`	`default:`
`3106`		`-#ifdef SK_DEBUG`
`3107`		`- ABORT("unsupported declaration: %s\n", decl.description().c_str());`
`3108`		`-#endif`
	`3104`	`+ SkDEBUGFAILF("unsupported declaration: %s\n", decl.description().c_str());`
`3109`	`3105`	`break;`
`3110`	`3106`	`}`
`3111`	`3107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,7 @@ void MetalCodeGenerator::writeExpression(const Expression& expr, Precedence pare`
`218`	`218`	`this->writeIndexExpression(expr.as<IndexExpression>());`
`219`	`219`	`break;`
`220`	`220`	`default:`
`221`		`-#ifdef SK_DEBUG`
`222`		`- ABORT("unsupported expression: %s", expr.description().c_str());`
`223`		`-#endif`
	`221`	`+ SkDEBUGFAILF("unsupported expression: %s", expr.description().c_str());`
`224`	`222`	`break;`
`225`	`223`	`}`
`226`	`224`	`}`
`@@ -1784,9 +1782,7 @@ void MetalCodeGenerator::writeStatement(const Statement& s) {`
`1784`	`1782`	`this->write(";");`
`1785`	`1783`	`break;`
`1786`	`1784`	`default:`
`1787`		`-#ifdef SK_DEBUG`
`1788`		`- ABORT("unsupported statement: %s", s.description().c_str());`
`1789`		`-#endif`
	`1785`	`+ SkDEBUGFAILF("unsupported statement: %s", s.description().c_str());`
`1790`	`1786`	`break;`
`1791`	`1787`	`}`
`1792`	`1788`	`}`
`@@ -2218,9 +2214,7 @@ void MetalCodeGenerator::writeProgramElement(const ProgramElement& e) {`
`2218`	`2214`	`case ProgramElement::Kind::kEnum:`
`2219`	`2215`	`break;`
`2220`	`2216`	`default:`
`2221`		`-#ifdef SK_DEBUG`
`2222`		`- ABORT("unsupported program element: %s\n", e.description().c_str());`
`2223`		`-#endif`
	`2217`	`+ SkDEBUGFAILF("unsupported program element: %s\n", e.description().c_str());`
`2224`	`2218`	`break;`
`2225`	`2219`	`}`
`2226`	`2220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -598,9 +598,7 @@ SpvId SPIRVCodeGenerator::getType(const Type& rawType, const MemoryLayout& layou`
`598`	`598`	`if (type == *fContext.fTypes.fVoid) {`
`599`	`599`	`this->writeInstruction(SpvOpTypeVoid, result, fConstantBuffer);`
`600`	`600`	`} else {`
`601`		`-#ifdef SK_DEBUG`
`602`		`- ABORT("invalid type: %s", type.description().c_str());`
`603`		`-#endif`
	`601`	`+ SkDEBUGFAILF("invalid type: %s", type.description().c_str());`
`604`	`602`	`}`
`605`	`603`	`}`
`606`	`604`	`fTypeMap[key] = result;`
`@@ -723,9 +721,7 @@ SpvId SPIRVCodeGenerator::writeExpression(const Expression& expr, OutputStream&`
`723`	`721`	`case Expression::Kind::kIndex:`
`724`	`722`	`return this->writeIndexExpression(expr.as<IndexExpression>(), out);`
`725`	`723`	`default:`
`726`		`-#ifdef SK_DEBUG`
`727`		`- ABORT("unsupported expression: %s", expr.description().c_str());`
`728`		`-#endif`
	`724`	`+ SkDEBUGFAILF("unsupported expression: %s", expr.description().c_str());`
`729`	`725`	`break;`
`730`	`726`	`}`
`731`	`727`	`return -1;`
`@@ -2577,9 +2573,7 @@ SpvId SPIRVCodeGenerator::writePrefixExpression(const PrefixExpression& p, Outpu`
`2577`	`2573`	`} else if (is_signed(fContext, type)) {`
`2578`	`2574`	`this->writeInstruction(SpvOpSNegate, typeId, result, expr, out);`
`2579`	`2575`	`} else {`
`2580`		`-#ifdef SK_DEBUG`
`2581`		`- ABORT("unsupported prefix expression %s", p.description().c_str());`
`2582`		`-#endif`
	`2576`	`+ SkDEBUGFAILF("unsupported prefix expression %s", p.description().c_str());`
`2583`	`2577`	`}`
`2584`	`2578`	`this->writePrecisionModifier(type, result);`
`2585`	`2579`	`return result;`
`@@ -2618,9 +2612,7 @@ SpvId SPIRVCodeGenerator::writePrefixExpression(const PrefixExpression& p, Outpu`
`2618`	`2612`	`return result;`
`2619`	`2613`	`}`
`2620`	`2614`	`default:`
`2621`		`-#ifdef SK_DEBUG`
`2622`		`- ABORT("unsupported prefix expression: %s", p.description().c_str());`
`2623`		`-#endif`
	`2615`	`+ SkDEBUGFAILF("unsupported prefix expression: %s", p.description().c_str());`
`2624`	`2616`	`return -1;`
`2625`	`2617`	`}`
`2626`	`2618`	`}`
`@@ -2644,9 +2636,7 @@ SpvId SPIRVCodeGenerator::writePostfixExpression(const PostfixExpression& p, Out`
`2644`	`2636`	`return result;`
`2645`	`2637`	`}`
`2646`	`2638`	`default:`
`2647`		`-#ifdef SK_DEBUG`
`2648`		`- ABORT("unsupported postfix expression %s", p.description().c_str());`
`2649`		`-#endif`
	`2639`	`+ SkDEBUGFAILF("unsupported postfix expression %s", p.description().c_str());`
`2650`	`2640`	`return -1;`
`2651`	`2641`	`}`
`2652`	`2642`	`}`
`@@ -3028,9 +3018,7 @@ void SPIRVCodeGenerator::writeStatement(const Statement& s, OutputStream& out) {`
`3028`	`3018`	`this->writeInstruction(SpvOpKill, out);`
`3029`	`3019`	`break;`
`3030`	`3020`	`default:`
`3031`		`-#ifdef SK_DEBUG`
`3032`		`- ABORT("unsupported statement: %s", s.description().c_str());`
`3033`		`-#endif`
	`3021`	`+ SkDEBUGFAILF("unsupported statement: %s", s.description().c_str());`
`3034`	`3022`	`break;`
`3035`	`3023`	`}`
`3036`	`3024`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons`
`204`	`204`	`default: ABORT("unsupported row count (%d)", rows);`
`205`	`205`	`}`
`206`	`206`	`}`
`207`		`-#ifdef SK_DEBUG`
`208`		`- ABORT("unsupported toCompound type %s", this->description().c_str());`
`209`		`-#endif`
	`207`	`+ SkDEBUGFAILF("unsupported toCompound type %s", this->description().c_str());`
`210`	`208`	`return *context.fTypes.fVoid;`
`211`	`209`	`}`
`212`	`210`