Changeset 209906 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Dec 15, 2016, 8:52:20 PM (8 years ago)

Author:

Darin Adler

Message:

Use asString instead of toWTFString, toString, or getString when we already checked isString
​https://bugs.webkit.org/show_bug.cgi?id=165895

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

Once we have called isString, we should always use asString and value rather than using
functions that have to deal with non-JSString objects. This leads to slightly fewer branches,
slightly less reference count churn, since the string is stored right inside the JSString,
and obviates the need for exception handling.

• bindings/ScriptValue.cpp:

(Inspector::jsToInspectorValue): Use asString/value instead of getString.

• dfg/DFGOperations.cpp:

(JSC::DFG::operationMapHash): Call jsMapHash with its new arguments.

• inspector/JSInjectedScriptHost.cpp:

(Inspector::JSInjectedScriptHost::evaluateWithScopeExtension): Use asString/value instead
of toWTFString.

• inspector/JSJavaScriptCallFrame.cpp:

(Inspector::JSJavaScriptCallFrame::evaluateWithScopeExtension): Ditto.

• inspector/agents/InspectorHeapAgent.cpp:

(Inspector::InspectorHeapAgent::getPreview): Use asString/tryGetValue, instead of the
peculiar getString(nullptr) that was here before.

• jsc.cpp:

(functionGetGetterSetter): Use asString/toIdentifier instead of the much less efficient
toWTFString/Identifier::fromString.
(functionIsRope): Use asString instead of jsCast<JSString*>; same thing, but we should
prefer the asString function, since it exists.
(functionFindTypeForExpression): Use asString/value instead of getString.
(functionHasBasicBlockExecuted): Ditto.
(functionBasicBlockExecutionCount): Ditto.
(functionCreateBuiltin): Use asString/value instead of toWTFString and removed
unneeded RETURN_IF_EXCEPTION.
(valueWithTypeOfWasmValue): Use asString instead of jsCast<String*>.
(box): Ditto.

• runtime/DateConstructor.cpp:

(JSC::constructDate): Use asString/values instead of getString.

• runtime/ExceptionHelpers.cpp:

(JSC::errorDescriptionForValue): Tweaked formatting.

• runtime/HashMapImpl.h:

(JSC::jsMapHash): Changed this function to use asString/value.

• runtime/JSCJSValue.cpp:

(JSC::JSValue::dumpInContextAssumingStructure): Use asString instead of
jsCast<JSString*>.
(JSC::JSValue::dumpForBacktrace): Ditto.

• runtime/JSCJSValueInlines.h:

(JSC::toPreferredPrimitiveType): Ditto.

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::globalFuncEval): Use asString/value instead of toWTFString.

• runtime/JSString.cpp:

(JSC::JSString::destroy): Streamlined by removing local variable.
(JSC::JSString::estimatedSize): Use asString instead of jsCast<JSString*>.
(JSC::JSString::visitChildren): Ditto.
(JSC::JSString::toThis): Ditto.

• runtime/JSString.h:

(JSC::JSValue::toString): Ditto.
(JSC::JSValue::toStringOrNull): Ditto.

• runtime/NumberPrototype.cpp:

(JSC::numberProtoFuncValueOf): Ditto.

• runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncToString): Ditto.

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncRepeatCharacter): Ditto.
(JSC::stringProtoFuncSubstr): Ditto.
(JSC::builtinStringSubstrInternal): Simplified assertion by removing local variable.

Source/WebCore:

• Modules/fetch/FetchBody.cpp:

(WebCore::FetchBody::extract): Use asString/value instead of toWTFString.

• Modules/mediastream/SDPProcessor.cpp:

(WebCore::SDPProcessor::callScript): Use asString/value instead of getString.

• bindings/js/ArrayValue.cpp:

(WebCore::ArrayValue::get): Use asString/value instead of toWTFString.

• bindings/js/IDBBindingUtilities.cpp:

(WebCore::get): Use asString/length instead of toString/length.
(WebCore::createIDBKeyFromValue): Use asString/value instead of toWTFString.

• bindings/js/JSCryptoAlgorithmDictionary.cpp:

(WebCore::JSCryptoAlgorithmDictionary::getAlgorithmIdentifier): Ditto.

• bindings/js/JSDataCueCustom.cpp:

(WebCore::constructJSDataCue): Use asString/value instead of getString.

• bindings/js/JSInspectorFrontendHostCustom.cpp:

(WebCore::populateContextMenuItems): Use asString/value instead of toWTFString.

• bindings/js/ScriptController.cpp:

(WebCore::jsValueToModuleKey): Use asString/toIdentifier instead of
jsCast<JSString*>/value/Identifier::fromString.

• bindings/js/SerializedScriptValue.cpp:

(WebCore::CloneSerializer::dumpIfTerminal): Streamline by getting rid of local variable.

• contentextensions/ContentExtensionParser.cpp:

(WebCore::ContentExtensions::getDomainList): Use asString instead of jsCast<JSString*>.
(WebCore::ContentExtensions::loadTrigger): Use asString/value instead of toWTFString.
(WebCore::ContentExtensions::loadAction): Ditto.

• css/FontFace.cpp:

(WebCore::FontFace::create): Use asString/value instead of getString.

Source/WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::addValueToArray): Use asString/value instead of
toWTFString.

• WebView/WebView.mm:

(aeDescFromJSValue): Use asString/value instead of getString.

Source/WebKit2:

• WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:

(WebKit::NPRuntimeObjectMap::convertJSValueToNPVariant): Use asString/value instead of toWTFString.

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (9 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -1877 +1877 @@
         return JSValue::encode(jsUndefined());
 
-    Identifier ident = Identifier::fromString(&exec->vm(), property.toWTFString(exec));
-
     PropertySlot slot(value, PropertySlot::InternalMethodType::VMInquiry);
-    value.getPropertySlot(exec, ident, slot);
+    value.getPropertySlot(exec, asString(property)->toIdentifier(exec), slot);
 
     JSValue result;
@@ -2105 +2103 @@
     if (!argument.isString())
         return JSValue::encode(jsBoolean(false));
-    const StringImpl* impl = jsCast<JSString*>(argument)->tryGetValueImpl();
+    const StringImpl* impl = asString(argument)->tryGetValueImpl();
     return JSValue::encode(jsBoolean(!impl));
 }
@@ -2283 +2281 @@
 
     RELEASE_ASSERT(exec->argument(1).isString());
-    String substring = exec->argument(1).getString(exec);
+    String substring = asString(exec->argument(1))->value(exec);
     String sourceCodeText = executable->source().view().toString();
     unsigned offset = static_cast<unsigned>(sourceCodeText.find(substring) + executable->source().startOffset());
@@ -2321 +2319 @@
 
     RELEASE_ASSERT(exec->argument(1).isString());
-    String substring = exec->argument(1).getString(exec);
+    String substring = asString(exec->argument(1))->value(exec);
     String sourceCodeText = executable->source().view().toString();
     RELEASE_ASSERT(sourceCodeText.contains(substring));
@@ -2339 +2337 @@
 
     RELEASE_ASSERT(exec->argument(1).isString());
-    String substring = exec->argument(1).getString(exec);
+    String substring = asString(exec->argument(1))->value(exec);
     String sourceCodeText = executable->source().view().toString();
     RELEASE_ASSERT(sourceCodeText.contains(substring));
@@ -2404 +2402 @@
         return JSValue::encode(jsUndefined());
 
-    String functionText = exec->argument(0).toWTFString(exec);
+    String functionText = asString(exec->argument(0))->value(exec);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
@@ -2511 +2509 @@
 static CString valueWithTypeOfWasmValue(ExecState* exec, VM& vm, JSValue value, JSValue wasmValue)
 {
-    JSString* type = jsCast<JSString*>(wasmValue.get(exec, makeIdentifier(vm, "type")));
+    JSString* type = asString(wasmValue.get(exec, makeIdentifier(vm, "type")));
 
     const String& typeString = type->value(exec);
@@ -2524 +2522 @@
 {
 
-    JSString* type = jsCast<JSString*>(wasmValue.get(exec, makeIdentifier(vm, "type")));
+    JSString* type = asString(wasmValue.get(exec, makeIdentifier(vm, "type")));
     JSValue value = wasmValue.get(exec, makeIdentifier(vm, "value"));
 
@@ -2531 +2529 @@
             return false;
 
-        const char* str = toCString(jsCast<JSString*>(value)->value(exec)).data();
+        const char* str = toCString(asString(value)->value(exec)).data();
         int scanResult;
         int length = std::strlen(str);