X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/14957cd040308e3eeec43d26bae5d76da13fcd85..refs/heads/master:/runtime/Operations.cpp

diff --git a/runtime/Operations.cpp b/runtime/Operations.cpp
index f129a80..5732cfd 100644
--- a/runtime/Operations.cpp
+++ b/runtime/Operations.cpp
@@ -23,10 +23,9 @@
 #include "Operations.h"
 
 #include "Error.h"
+#include "JSCInlines.h"
 #include "JSObject.h"
 #include "JSString.h"
-#include <math.h>
-#include <stdio.h>
 #include <wtf/MathExtras.h>
 
 namespace JSC {
@@ -47,52 +46,64 @@ NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)
     JSValue p1 = v1.toPrimitive(callFrame);
     JSValue p2 = v2.toPrimitive(callFrame);
 
-    if (p1.isString()) {
-        return p2.isString()
-            ? jsString(callFrame, asString(p1), asString(p2))
-            : jsString(callFrame, asString(p1), p2.toString(callFrame));
-    }
+    if (p1.isString())
+        return jsString(callFrame, asString(p1), p2.toString(callFrame));
+
     if (p2.isString())
         return jsString(callFrame, p1.toString(callFrame), asString(p2));
 
     return jsNumber(p1.toNumber(callFrame) + p2.toNumber(callFrame));
 }
 
-JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v)
+JSValue jsTypeStringForValue(VM& vm, JSGlobalObject* globalObject, JSValue v)
 {
     if (v.isUndefined())
-        return jsNontrivialString(callFrame, "undefined");
+        return vm.smallStrings.undefinedString();
     if (v.isBoolean())
-        return jsNontrivialString(callFrame, "boolean");
+        return vm.smallStrings.booleanString();
     if (v.isNumber())
-        return jsNontrivialString(callFrame, "number");
+        return vm.smallStrings.numberString();
     if (v.isString())
-        return jsNontrivialString(callFrame, "string");
+        return vm.smallStrings.stringString();
+    if (v.isSymbol())
+        return vm.smallStrings.symbolString();
     if (v.isObject()) {
+        JSObject* object = asObject(v);
         // Return "undefined" for objects that should be treated
         // as null when doing comparisons.
-        if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
-            return jsNontrivialString(callFrame, "undefined");
-        CallData callData;
-        if (asObject(v)->getCallData(callData) != CallTypeNone)
-            return jsNontrivialString(callFrame, "function");
+        if (object->structure(vm)->masqueradesAsUndefined(globalObject))
+            return vm.smallStrings.undefinedString();
+        if (object->type() == JSFunctionType)
+            return vm.smallStrings.functionString();
+        if (object->inlineTypeFlags() & TypeOfShouldCallGetCallData) {
+            CallData callData;
+            JSObject* object = asObject(v);
+            if (object->methodTable(vm)->getCallData(object, callData) != CallTypeNone)
+                return vm.smallStrings.functionString();
+        }
     }
-    return jsNontrivialString(callFrame, "object");
+    return vm.smallStrings.objectString();
+}
+
+JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v)
+{
+    return jsTypeStringForValue(callFrame->vm(), callFrame->lexicalGlobalObject(), v);
 }
 
-bool jsIsObjectType(JSValue v)
+bool jsIsObjectTypeOrNull(CallFrame* callFrame, JSValue v)
 {
     if (!v.isCell())
         return v.isNull();
 
-    JSType type = v.asCell()->structure()->typeInfo().type();
-    if (type == NumberType || type == StringType)
+    JSType type = v.asCell()->type();
+    if (type == StringType || type == SymbolType)
         return false;
-    if (type == ObjectType) {
-        if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
+    if (type >= ObjectType) {
+        if (asObject(v)->structure(callFrame->vm())->masqueradesAsUndefined(callFrame->lexicalGlobalObject()))
             return false;
         CallData callData;
-        if (asObject(v)->getCallData(callData) != CallTypeNone)
+        JSObject* object = asObject(v);
+        if (object->methodTable(callFrame->vm())->getCallData(object, callData) != CallTypeNone)
             return false;
     }
     return true;
@@ -102,7 +113,8 @@ bool jsIsFunctionType(JSValue v)
 {
     if (v.isObject()) {
         CallData callData;
-        if (asObject(v)->getCallData(callData) != CallTypeNone)
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
             return true;
     }
     return false;