diff options
Diffstat (limited to 'Source/JavaScriptCore/runtime/Operations.cpp')
| -rw-r--r-- | Source/JavaScriptCore/runtime/Operations.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/Source/JavaScriptCore/runtime/Operations.cpp b/Source/JavaScriptCore/runtime/Operations.cpp index 5732cfd0c..f0ffd5668 100644 --- a/Source/JavaScriptCore/runtime/Operations.cpp +++ b/Source/JavaScriptCore/runtime/Operations.cpp @@ -23,7 +23,6 @@ #include "Operations.h" #include "Error.h" -#include "JSCInlines.h" #include "JSObject.h" #include "JSString.h" #include <wtf/MathExtras.h> @@ -65,22 +64,15 @@ JSValue jsTypeStringForValue(VM& vm, JSGlobalObject* globalObject, JSValue v) return vm.smallStrings.numberString(); if (v.isString()) 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 (object->structure(vm)->masqueradesAsUndefined(globalObject)) + if (asObject(v)->structure()->masqueradesAsUndefined(globalObject)) return vm.smallStrings.undefinedString(); - if (object->type() == JSFunctionType) + CallData callData; + JSObject* object = asObject(v); + if (object->methodTable()->getCallData(object, callData) != CallTypeNone) 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 vm.smallStrings.objectString(); } @@ -90,20 +82,20 @@ JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v) return jsTypeStringForValue(callFrame->vm(), callFrame->lexicalGlobalObject(), v); } -bool jsIsObjectTypeOrNull(CallFrame* callFrame, JSValue v) +bool jsIsObjectType(CallFrame* callFrame, JSValue v) { if (!v.isCell()) return v.isNull(); - JSType type = v.asCell()->type(); - if (type == StringType || type == SymbolType) + JSType type = v.asCell()->structure()->typeInfo().type(); + if (type == StringType) return false; if (type >= ObjectType) { - if (asObject(v)->structure(callFrame->vm())->masqueradesAsUndefined(callFrame->lexicalGlobalObject())) + if (asObject(v)->structure()->masqueradesAsUndefined(callFrame->lexicalGlobalObject())) return false; CallData callData; JSObject* object = asObject(v); - if (object->methodTable(callFrame->vm())->getCallData(object, callData) != CallTypeNone) + if (object->methodTable()->getCallData(object, callData) != CallTypeNone) return false; } return true; |