Further work towards an exact GC

Add some more convenience in the helper classes
in qscopedvalue_p.h
Make accesses to CallData safer, and change
ExecutionEngine::newObject() to return a safe
pointer.

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

1 files changed, 7 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp
index 3702428553..b9b64cf534 100644
--- a/src/qml/jsruntime/qv4numberobject.cpp
+++ b/src/qml/jsruntime/qv4numberobject.cpp
@@ -110,9 +110,8 @@ ReturnedValue NumberPrototype::method_toString(SimpleCallContext *ctx)
 {
     double num = thisNumberValue(ctx).asDouble();
 
-    Value arg = ctx->argument(0);
-    if (!arg.isUndefined()) {
-        int radix = arg.toInt32();
+    if (ctx->argumentCount && !ctx->arguments[0].isUndefined()) {
+        int radix = ctx->arguments[0].toInt32();
         if (radix < 2 || radix > 36) {
             ctx->throwError(QString::fromLatin1("Number.prototype.toString: %0 is not a valid radix")
                             .arg(radix));
@@ -180,7 +179,7 @@ ReturnedValue NumberPrototype::method_toFixed(SimpleCallContext *ctx)
     double fdigits = 0;
 
     if (ctx->argumentCount > 0)
-        fdigits = ctx->argument(0).toInteger();
+        fdigits = ctx->arguments[0].toInteger();
 
     if (std::isnan(fdigits))
         fdigits = 0;
@@ -204,11 +203,10 @@ ReturnedValue NumberPrototype::method_toExponential(SimpleCallContext *ctx)
 {
     double d = thisNumberValue(ctx).asDouble();
 
-    Value fraction = ctx->argument(0);
     int fdigits = -1;
 
-    if (!fraction.isUndefined()) {
-        int fdigits = ctx->argument(0).toInt32();
+    if (ctx->argumentCount && !ctx->arguments[0].isUndefined()) {
+        int fdigits = ctx->arguments[0].toInt32();
         if (fdigits < 0 || fdigits > 20) {
             String *error = ctx->engine->newString(QStringLiteral("Number.prototype.toExponential: fractionDigits out of range"));
             ctx->throwRangeError(Value::fromString(error));
@@ -229,11 +227,10 @@ ReturnedValue NumberPrototype::method_toPrecision(SimpleCallContext *ctx)
 
     ScopedValue v(scope, thisNumberValue(ctx));
 
-    Value prec = ctx->argument(0);
-    if (prec.isUndefined())
+    if (!ctx->argumentCount || ctx->arguments[0].isUndefined())
         return __qmljs_to_string(v, ctx);
 
-    double precision = prec.toInt32();
+    double precision = ctx->arguments[0].toInt32();
     if (precision < 1 || precision > 21) {
         String *error = ctx->engine->newString(QStringLiteral("Number.prototype.toPrecision: precision out of range"));
         ctx->throwRangeError(Value::fromString(error));