Changeset 43153 in webkit for trunk/JavaScriptCore/jit

Timestamp:

May 2, 2009, 6:58:45 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-05-02 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Simplified null-ish JSValues.

Replaced calls to noValue() with calls to JSValue() (which is what
noValue() returned). Removed noValue().

Replaced almost all uses of jsImpossibleValue() with uses of JSValue().
Its one remaining use is for construction of hash table deleted values.
For that specific task, I made a new, private constructor with a special
tag. Removed jsImpossibleValue().

Removed "JSValue()" initialiazers, since default construction happens...
by default.

• API/JSCallbackObjectFunctions.h: (JSC::::call):
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::emitLoad):
• bytecompiler/BytecodeGenerator.h:
• debugger/DebuggerCallFrame.cpp: (JSC::DebuggerCallFrame::evaluate):
• debugger/DebuggerCallFrame.h: (JSC::DebuggerCallFrame::DebuggerCallFrame):
• interpreter/CallFrame.h: (JSC::ExecState::clearException):
• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): (JSC::Interpreter::retrieveLastCaller):
• interpreter/Register.h: (JSC::Register::Register):
• jit/JITCall.cpp: (JSC::JIT::unlinkCall): (JSC::JIT::compileOpCallInitializeCallFrame): (JSC::JIT::compileOpCall):
• jit/JITStubs.cpp: (JSC::JITStubs::cti_op_call_eval): (JSC::JITStubs::cti_vm_throw):
• profiler/Profiler.cpp: (JSC::Profiler::willExecute): (JSC::Profiler::didExecute):
• runtime/ArrayPrototype.cpp: (JSC::getProperty):
• runtime/Completion.cpp: (JSC::evaluate):
• runtime/Completion.h: (JSC::Completion::Completion):
• runtime/GetterSetter.cpp: (JSC::GetterSetter::getPrimitiveNumber):
• runtime/JSArray.cpp: (JSC::JSArray::putSlowCase): (JSC::JSArray::deleteProperty): (JSC::JSArray::increaseVectorLength): (JSC::JSArray::setLength): (JSC::JSArray::pop): (JSC::JSArray::sort): (JSC::JSArray::compactForSorting):
• runtime/JSCell.cpp: (JSC::JSCell::getJSNumber):
• runtime/JSCell.h: (JSC::JSValue::getJSNumber):
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• runtime/JSImmediate.h: (JSC::JSImmediate::fromNumberOutsideIntegerRange): (JSC::JSImmediate::from):
• runtime/JSNumberCell.cpp: (JSC::jsNumberCell):
• runtime/JSObject.cpp: (JSC::callDefaultValueFunction):
• runtime/JSObject.h: (JSC::JSObject::getDirect):
• runtime/JSPropertyNameIterator.cpp: (JSC::JSPropertyNameIterator::toPrimitive):
• runtime/JSPropertyNameIterator.h: (JSC::JSPropertyNameIterator::next):
• runtime/JSValue.h: (JSC::JSValue::): (JSC::JSValueHashTraits::constructDeletedValue): (JSC::JSValueHashTraits::isDeletedValue): (JSC::JSValue::JSValue):
• runtime/JSWrapperObject.h: (JSC::JSWrapperObject::JSWrapperObject):
• runtime/Operations.h: (JSC::resolveBase):
• runtime/PropertySlot.h: (JSC::PropertySlot::clearBase): (JSC::PropertySlot::clearValue):

WebCore:

2009-05-02 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Simplified null-ish JSValues.

Replaced calls to noValue() with calls to JSValue() (which is what
noValue() returned). Removed noValue().

Removed "JSValue()" initialiazers, since default construction happens...
by default.

• bindings/js/JSDOMBinding.cpp: (WebCore::setDOMException):
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::open): (WebCore::JSDOMWindow::showModalDialog):
• bindings/js/JSEventListener.cpp: (WebCore::JSEventListener::handleEvent):
• bindings/js/JSJavaScriptCallFrameCustom.cpp: (WebCore::JSJavaScriptCallFrame::evaluate):
• bindings/js/JSSQLResultSetRowListCustom.cpp: (WebCore::JSSQLResultSetRowList::item):
• bindings/js/ScriptController.cpp: (WebCore::ScriptController::evaluate):
• bindings/js/ScriptValue.h: (WebCore::ScriptValue::ScriptValue): (WebCore::ScriptValue::hasNoValue):
• bindings/js/WorkerScriptController.cpp: (WebCore::WorkerScriptController::evaluate):
• bridge/jni/jni_instance.cpp: (JavaInstance::invokeMethod):
• bridge/jni/jni_runtime.cpp: (JavaField::dispatchValueFromInstance): (JavaField::dispatchSetValueToInstance):
• bridge/runtime.h: (JSC::Bindings::Instance::invokeConstruct):

WebKit/mac:

2009-05-02 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Simplified null-ish JSValues.

Replaced calls to noValue() with calls to JSValue() (which is what
noValue() returned). Removed noValue().

Removed "JSValue()" initialiazers, since default construction happens...
by default.

• WebView/WebScriptDebugDelegate.mm: (-[WebScriptCallFrame evaluateWebScript:]):

Location:

trunk/JavaScriptCore/jit

Files:

• JITCall.cpp (modified) (6 diffs)
• JITStubs.cpp (modified) (4 diffs)

trunk/JavaScriptCore/jit/JITCall.cpp

@@ -50 +50 @@
     // (and, if a new JSFunction happened to be constructed at the same location, we could get a false positive
     // match).  Reset the check so it no longer matches.
-    callLinkInfo->hotPathBegin.repatch(JSValue::encode(jsImpossibleValue()));
+    callLinkInfo->hotPathBegin.repatch(JSValue::encode(JSValue()));
 }
 
@@ -76 +76 @@
     loadPtr(Address(regT2, FIELD_OFFSET(JSFunction, m_scopeChain) + FIELD_OFFSET(ScopeChain, m_node)), regT1); // newScopeChain
 
-    storePtr(ImmPtr(JSValue::encode(noValue())), Address(callFrameRegister, RegisterFile::OptionalCalleeArguments * static_cast<int>(sizeof(Register))));
+    storePtr(ImmPtr(JSValue::encode(JSValue())), Address(callFrameRegister, RegisterFile::OptionalCalleeArguments * static_cast<int>(sizeof(Register))));
     storePtr(regT2, Address(callFrameRegister, RegisterFile::Callee * static_cast<int>(sizeof(Register))));
     storePtr(regT1, Address(callFrameRegister, RegisterFile::ScopeChain * static_cast<int>(sizeof(Register))));
@@ -145 +145 @@
 
         emitCTICall(JITStubs::cti_op_call_eval);
-        wasEval = branchPtr(NotEqual, regT0, ImmPtr(JSValue::encode(jsImpossibleValue())));
+        wasEval = branchPtr(NotEqual, regT0, ImmPtr(JSValue::encode(JSValue())));
     }
 
@@ -213 +213 @@
 
         emitCTICall(JITStubs::cti_op_call_eval);
-        wasEval = branchPtr(NotEqual, regT0, ImmPtr(JSValue::encode(jsImpossibleValue())));
+        wasEval = branchPtr(NotEqual, regT0, ImmPtr(JSValue::encode(JSValue())));
     }
 
@@ -220 +220 @@
     emitGetVirtualRegister(callee, regT2);
     DataLabelPtr addressOfLinkedFunctionCheck;
-    Jump jumpToSlow = branchPtrWithPatch(NotEqual, regT2, addressOfLinkedFunctionCheck, ImmPtr(JSValue::encode(jsImpossibleValue())));
+    Jump jumpToSlow = branchPtrWithPatch(NotEqual, regT2, addressOfLinkedFunctionCheck, ImmPtr(JSValue::encode(JSValue())));
     addSlowCase(jumpToSlow);
     ASSERT(differenceBetween(addressOfLinkedFunctionCheck, jumpToSlow) == patchOffsetOpCallCompareToJump);
@@ -241 +241 @@
     // Fast version of stack frame initialization, directly relative to edi.
     // Note that this omits to set up RegisterFile::CodeBlock, which is set in the callee
-    storePtr(ImmPtr(JSValue::encode(noValue())), Address(callFrameRegister, (registerOffset + RegisterFile::OptionalCalleeArguments) * static_cast<int>(sizeof(Register))));
+    storePtr(ImmPtr(JSValue::encode(JSValue())), Address(callFrameRegister, (registerOffset + RegisterFile::OptionalCalleeArguments) * static_cast<int>(sizeof(Register))));
     storePtr(regT2, Address(callFrameRegister, (registerOffset + RegisterFile::Callee) * static_cast<int>(sizeof(Register))));
     loadPtr(Address(regT2, FIELD_OFFSET(JSFunction, m_scopeChain) + FIELD_OFFSET(ScopeChain, m_node)), regT1); // newScopeChain

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -299 +299 @@
 #define CHECK_FOR_EXCEPTION() \
     do { \
-        if (UNLIKELY(ARG_globalData->exception != noValue())) \
+        if (UNLIKELY(ARG_globalData->exception != JSValue())) \
             VM_THROW_EXCEPTION(); \
     } while (0)
 #define CHECK_FOR_EXCEPTION_AT_END() \
     do { \
-        if (UNLIKELY(ARG_globalData->exception != noValue())) \
+        if (UNLIKELY(ARG_globalData->exception != JSValue())) \
             VM_THROW_EXCEPTION_AT_END(); \
     } while (0)
 #define CHECK_FOR_EXCEPTION_VOID() \
     do { \
-        if (UNLIKELY(ARG_globalData->exception != noValue())) { \
+        if (UNLIKELY(ARG_globalData->exception != JSValue())) { \
             VM_THROW_EXCEPTION_AT_END(); \
             return; \
@@ -1895 +1895 @@
 
     if (thisValue == globalObject && funcVal == globalObject->evalFunction()) {
-        JSValue exceptionValue = noValue();
+        JSValue exceptionValue;
         JSValue result = interpreter->callEval(callFrame, registerFile, argv, argCount, registerOffset, exceptionValue);
-        if (UNLIKELY(exceptionValue != noValue())) {
+        if (UNLIKELY(exceptionValue != JSValue())) {
             ARG_globalData->exception = exceptionValue;
             VM_THROW_EXCEPTION_AT_END();
@@ -1904 +1904 @@
     }
 
-    return JSValue::encode(jsImpossibleValue());
+    return JSValue::encode(JSValue());
 }
 
@@ -2259 +2259 @@
     JSValue exceptionValue = globalData->exception;
     ASSERT(exceptionValue);
-    globalData->exception = noValue();
+    globalData->exception = JSValue();
 
     HandlerInfo* handler = globalData->interpreter->throwException(callFrame, exceptionValue, vPCIndex, false);