Replace assert() with project-specific version.
Our convention is to use our own form of assertion (bccAssert,
rsAssert, slangAssert) rather than C standard assertion (assert)
because the latter is disabled for the Android build process.
However, a few instances of assert() somehow made it through.
Bug 21444723
Change-Id: I6702268d452317bf0d78304f112fbfafefe3d5b9
diff --git a/lib/Core/Compiler.cpp b/lib/Core/Compiler.cpp
index 33a085b..1b8c350 100644
--- a/lib/Core/Compiler.cpp
+++ b/lib/Core/Compiler.cpp
@@ -78,7 +78,7 @@
// This assert should never be reached as the compiler verifies that the
// above switch coveres all enum values.
- assert(false && "Unknown error code encountered");
+ bccAssert(false && "Unknown error code encountered");
return "";
}
diff --git a/lib/Renderscript/RSCompilerDriver.cpp b/lib/Renderscript/RSCompilerDriver.cpp
index 463560c..942a1f3 100644
--- a/lib/Renderscript/RSCompilerDriver.cpp
+++ b/lib/Renderscript/RSCompilerDriver.cpp
@@ -96,7 +96,7 @@
#if defined(PROVIDE_ARM_CODEGEN)
bcinfo::MetadataExtractor me(&pScript.getSource().getModule());
if (!me.extract()) {
- assert("Could not extract RS pragma metadata for module!");
+ bccAssert("Could not extract RS pragma metadata for module!");
}
bool script_full_prec = (me.getRSFloatPrecision() == bcinfo::RS_FP_Full);
diff --git a/lib/Renderscript/RSForEachExpand.cpp b/lib/Renderscript/RSForEachExpand.cpp
index dc0fc85..20d3fb8 100644
--- a/lib/Renderscript/RSForEachExpand.cpp
+++ b/lib/Renderscript/RSForEachExpand.cpp
@@ -351,7 +351,7 @@
llvm::Value *LowerBound,
llvm::Value *UpperBound,
llvm::PHINode **LoopIV) {
- assert(LowerBound->getType() == UpperBound->getType());
+ bccAssert(LowerBound->getType() == UpperBound->getType());
llvm::BasicBlock *CondBB, *AfterBB, *HeaderBB;
llvm::Value *Cond, *IVNext;
