Use Q_ASSERT instead of assert

Change-Id: I6185b59a7dfd6977ce82581ab4385e07d78f13f6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

4 files changed, 18 insertions, 20 deletions

diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp
index 2393c9a8ca..cd44b537df 100644
--- a/src/qml/jit/qv4assembler.cpp
+++ b/src/qml/jit/qv4assembler.cpp
@@ -54,7 +54,6 @@
 #include <WTFStubs.h>
 
 #include <iostream>
-#include <cassert>
 
 #if ENABLE(ASSEMBLER)
 
diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h
index d8efea17af..085da34ed3 100644
--- a/src/qml/jit/qv4assembler_p.h
+++ b/src/qml/jit/qv4assembler_p.h
@@ -150,7 +150,7 @@ public:
     static const int RegisterArgumentCount = 0;
     static RegisterID registerForArgument(int)
     {
-        assert(false);
+        Q_ASSERT(false);
         // Not reached.
         return JSC::X86Registers::eax;
     }
@@ -187,7 +187,7 @@ public:
             JSC::X86Registers::r8,
             JSC::X86Registers::r9
         };
-        assert(index >= 0 && index < RegisterArgumentCount);
+        Q_ASSERT(index >= 0 && index < RegisterArgumentCount);
         return regs[index];
     };
     static const int StackShadowSpace = 32;
@@ -203,7 +203,7 @@ public:
             JSC::X86Registers::r8,
             JSC::X86Registers::r9
         };
-        assert(index >= 0 && index < RegisterArgumentCount);
+        Q_ASSERT(index >= 0 && index < RegisterArgumentCount);
         return regs[index];
     };
     static const int StackShadowSpace = 0;
@@ -238,7 +238,7 @@ public:
     static const int RegisterArgumentCount = 4;
     static RegisterID registerForArgument(int index)
     {
-        assert(index >= 0 && index < RegisterArgumentCount);
+        Q_ASSERT(index >= 0 && index < RegisterArgumentCount);
         return static_cast<RegisterID>(JSC::ARMRegisters::r0 + index);
     };
 
@@ -582,7 +582,7 @@ public:
 
     void loadArgumentInRegister(Reference temp, RegisterID dest, int argumentNumber)
     {
-        assert(temp.value);
+        Q_ASSERT(temp.value);
         Pointer addr = loadTempAddress(dest, temp.value);
         loadArgumentInRegister(addr, dest, argumentNumber);
     }
@@ -591,7 +591,7 @@ public:
     {
         Q_UNUSED(argumentNumber);
 
-        assert(block.block);
+        Q_ASSERT(block.block);
         DataLabelPtr patch = moveWithPatch(TrustedImmPtr(0), dest);
         addPatch(patch, block.block);
     }
@@ -630,13 +630,13 @@ public:
         } else if (expr->asConst()) {
             loadArgumentInRegister(expr->asConst(), dest, argumentNumber);
         } else {
-            assert(!"unimplemented expression type in loadArgument");
+            Q_ASSERT(!"unimplemented expression type in loadArgument");
         }
     }
 #else
     void loadArgumentInRegister(IR::Expr*, RegisterID)
     {
-        assert(!"unimplemented: expression in loadArgument");
+        Q_ASSERT(!"unimplemented: expression in loadArgument");
     }
 #endif
 
@@ -771,7 +771,7 @@ public:
     template <int StackSlot>
     void loadArgumentOnStack(Reference temp, int argumentNumber)
     {
-        assert (temp.value);
+        Q_ASSERT (temp.value);
 
         Pointer ptr = loadTempAddress(ScratchRegister, temp.value);
         loadArgumentOnStack<StackSlot>(ptr, argumentNumber);
@@ -782,7 +782,7 @@ public:
     {
         Q_UNUSED(argumentNumber);
 
-        assert(block.block);
+        Q_ASSERT(block.block);
         DataLabelPtr patch = moveWithPatch(TrustedImmPtr(0), ScratchRegister);
         poke(ScratchRegister, StackSlot);
         addPatch(patch, block.block);
diff --git a/src/qml/jit/qv4binop.cpp b/src/qml/jit/qv4binop.cpp
index e584f1142f..a505221e87 100644
--- a/src/qml/jit/qv4binop.cpp
+++ b/src/qml/jit/qv4binop.cpp
@@ -148,7 +148,7 @@ void Binop::generate(IR::Expr *lhs, IR::Expr *rhs, IR::Temp *target)
                                      Assembler::PointerToValue(lhs),
                                      Assembler::PointerToValue(rhs));
     } else {
-        assert(!"unreachable");
+        Q_ASSERT(!"unreachable");
     }
 
     if (done.isSet())
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp
index d30d69e68f..5cda52832e 100644
--- a/src/qml/jit/qv4isel_masm.cpp
+++ b/src/qml/jit/qv4isel_masm.cpp
@@ -58,7 +58,6 @@
 #include <WTFStubs.h>
 
 #include <iostream>
-#include <cassert>
 
 #if ENABLE(ASSEMBLER)
 
@@ -132,7 +131,7 @@ JSC::MacroAssemblerCodeRef Assembler::link(int *codeSize)
             it.next();
             IR::BasicBlock *block = it.key();
             Label target = _addrs.value(block);
-            assert(target.isSet());
+            Q_ASSERT(target.isSet());
             foreach (Jump jump, it.value())
                 jump.linkTo(target, this);
         }
@@ -160,7 +159,7 @@ JSC::MacroAssemblerCodeRef Assembler::link(int *codeSize)
             it.next();
             IR::BasicBlock *block = it.key();
             Label target = _addrs.value(block);
-            assert(target.isSet());
+            Q_ASSERT(target.isSet());
             foreach (DataLabelPtr label, it.value())
                 linkBuffer.patch(label, linkBuffer.locationOf(target));
         }
@@ -941,7 +940,7 @@ void InstructionSelection::binop(IR::AluOp oper, IR::Expr *leftSource, IR::Expr
 void InstructionSelection::callProperty(IR::Expr *base, const QString &name, IR::ExprList *args,
                                         IR::Temp *result)
 {
-    assert(base != 0);
+    Q_ASSERT(base != 0);
 
     prepareCallData(args, base);
 
@@ -961,7 +960,7 @@ void InstructionSelection::callProperty(IR::Expr *base, const QString &name, IR:
 void InstructionSelection::callSubscript(IR::Expr *base, IR::Expr *index, IR::ExprList *args,
                                          IR::Temp *result)
 {
-    assert(base != 0);
+    Q_ASSERT(base != 0);
 
     prepareCallData(args, base);
     generateFunctionCall(result, Runtime::callElement, Assembler::ContextRegister,
@@ -1264,7 +1263,7 @@ void InstructionSelection::convertTypeToUInt32(IR::Temp *source, IR::Temp *targe
 
 void InstructionSelection::constructActivationProperty(IR::Name *func, IR::ExprList *args, IR::Temp *result)
 {
-    assert(func != 0);
+    Q_ASSERT(func != 0);
     prepareCallData(args, 0);
 
     if (useFastLookups && func->global) {
@@ -1301,7 +1300,7 @@ void InstructionSelection::constructProperty(IR::Temp *base, const QString &name
 
 void InstructionSelection::constructValue(IR::Temp *value, IR::ExprList *args, IR::Temp *result)
 {
-    assert(value != 0);
+    Q_ASSERT(value != 0);
 
     prepareCallData(args, 0);
     generateFunctionCall(result, Runtime::constructValue,
@@ -1371,7 +1370,7 @@ void InstructionSelection::visitCJump(IR::CJump *s)
         Runtime::CompareOperationContext opContext = 0;
         const char *opName = 0;
         switch (b->op) {
-        default: Q_UNREACHABLE(); assert(!"todo"); break;
+        default: Q_UNREACHABLE(); Q_ASSERT(!"todo"); break;
         case IR::OpGt: setOp(op, opName, Runtime::compareGreaterThan); break;
         case IR::OpLt: setOp(op, opName, Runtime::compareLessThan); break;
         case IR::OpGe: setOp(op, opName, Runtime::compareGreaterEqual); break;