Change CallData::argc to be a QV4::Value

Instead of mimicking a Value. This makes sure that argc now stays
correct even when anything on Value changes.

Most of the change is mechanical: replace callData->argc by
callData->argc().

Change-Id: I521831ae1ffb3966bad6589c18d7a373e13439d7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index c3a4275cac..d4d646be3f 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -268,10 +268,9 @@ ReturnedValue RegExpCtor::construct(const Managed *m, CallData *callData)
 
 ReturnedValue RegExpCtor::call(const Managed *that, CallData *callData)
 {
-    if (callData->argc > 0 && callData->args[0].as<RegExpObject>()) {
-        if (callData->argc == 1 || callData->args[1].isUndefined()) {
+    if (callData->argc() > 0 && callData->args[0].as<RegExpObject>()) {
+        if (callData->argc() == 1 || callData->args[1].isUndefined())
             return Encode(callData->args[0]);
-        }
     }
 
     return construct(that, callData);
@@ -440,8 +439,8 @@ ReturnedValue RegExpPrototype::method_compile(const BuiltinFunction *b, CallData
     if (!r)
         return scope.engine->throwTypeError();
 
-    JSCall jsCall(scope, scope.engine->regExpCtor(), callData->argc);
-    memcpy(jsCall->args, callData->args, callData->argc*sizeof(Value));
+    JSCall jsCall(scope, scope.engine->regExpCtor(), callData->argc());
+    memcpy(jsCall->args, callData->args, callData->argc()*sizeof(Value));
 
     Scoped<RegExpObject> re(scope, jsCall.callAsConstructor());