Changeset 195000 in webkit for trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

Timestamp:

Jan 13, 2016, 4:28:40 PM (9 years ago)

Author:

[email protected]

Message:

NativeExecutable should have a name field
​https://bugs.webkit.org/show_bug.cgi?id=153083

Reviewed by Geoffrey Garen.

This is going to help the SamplingProfiler come up
with names for NativeExecutable objects it encounters.

• jit/JITThunks.cpp:

(JSC::JITThunks::finalize):
(JSC::JITThunks::hostFunctionStub):

• jit/JITThunks.h:
• runtime/Executable.h:
• runtime/JSBoundFunction.cpp:

(JSC::JSBoundFunction::create):

• runtime/JSFunction.cpp:

(JSC::JSFunction::create):
(JSC::JSFunction::lookUpOrCreateNativeExecutable):

• runtime/JSFunction.h:

(JSC::JSFunction::createImpl):

• runtime/JSNativeStdFunction.cpp:

(JSC::JSNativeStdFunction::create):

• runtime/VM.cpp:

(JSC::thunkGeneratorForIntrinsic):
(JSC::VM::getHostFunction):

• runtime/VM.h:

(JSC::VM::getCTIStub):
(JSC::VM::exceptionOffset):

File:

• trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

@@ -79 +79 @@
 #endif
 
-NativeExecutable* JSFunction::lookUpOrCreateNativeExecutable(VM& vm, NativeFunction nativeFunction, Intrinsic intrinsic, NativeFunction nativeConstructor)
+NativeExecutable* JSFunction::lookUpOrCreateNativeExecutable(VM& vm, NativeFunction nativeFunction, Intrinsic intrinsic, NativeFunction nativeConstructor, const String& name)
 {
 #if !ENABLE(JIT)
@@ -86 +86 @@
     if (intrinsic != NoIntrinsic && vm.canUseJIT()) {
         ASSERT(nativeConstructor == callHostFunctionAsConstructor);
-        return vm.getHostFunction(nativeFunction, intrinsic);
+        return vm.getHostFunction(nativeFunction, intrinsic, name);
     }
 #endif
-    return vm.getHostFunction(nativeFunction, nativeConstructor);
+    return vm.getHostFunction(nativeFunction, nativeConstructor, name);
 }
 
 JSFunction* JSFunction::create(VM& vm, JSGlobalObject* globalObject, int length, const String& name, NativeFunction nativeFunction, Intrinsic intrinsic, NativeFunction nativeConstructor)
 {
-    NativeExecutable* executable = lookUpOrCreateNativeExecutable(vm, nativeFunction, intrinsic, nativeConstructor);
+    NativeExecutable* executable = lookUpOrCreateNativeExecutable(vm, nativeFunction, intrinsic, nativeConstructor, name);
     JSFunction* function = new (NotNull, allocateCell<JSFunction>(vm.heap)) JSFunction(vm, globalObject, globalObject->functionStructure());
     // Can't do this during initialization because getHostFunction might do a GC allocation.