Changeset 196155 in webkit

Timestamp:

Feb 4, 2016 4:36:20 PM (8 years ago)

Author:

keith_miller@apple.com

Message:

ArrayPrototype should have a destroy function
​https://bugs.webkit.org/show_bug.cgi?id=153847

Reviewed by Filip Pizlo.

ArrayPrototype should have an destroy function as it now has a unique_ptr member that
needs to be freed at the end of the object's life cycle. Also, this patch adds an
option, gcAtEnd, that will cause jsc.cpp to do a garbage collection before exiting.

• jsc.cpp:

(runJSC):
(jscmain):

• runtime/ArrayPrototype.cpp:

(JSC::ArrayPrototype::create):
(JSC::ArrayPrototype::destroy):

• runtime/ArrayPrototype.h:
• runtime/Options.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (2 diffs)
• runtime/ArrayPrototype.cpp (modified) (2 diffs)
• runtime/ArrayPrototype.h (modified) (1 diff)
• runtime/Options.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-04  Keith Miller  <keith_miller@apple.com>
+
+        ArrayPrototype should have a destroy function
+        https://bugs.webkit.org/show_bug.cgi?id=153847
+
+        Reviewed by Filip Pizlo.
+
+        ArrayPrototype should have an destroy function as it now has a unique_ptr member that
+        needs to be freed at the end of the object's life cycle. Also, this patch adds an
+        option, gcAtEnd, that will cause jsc.cpp to do a garbage collection before exiting.
+
+        * jsc.cpp:
+        (runJSC):
+        (jscmain):
+        * runtime/ArrayPrototype.cpp:
+        (JSC::ArrayPrototype::create):
+        (JSC::ArrayPrototype::destroy):
+        * runtime/ArrayPrototype.h:
+        * runtime/Options.h:
+
 2016-02-04  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -2024 +2024 @@
 }
 
+// We make this function no inline so that globalObject won't be on the stack if we do a GC in jscmain.
+static int NEVER_INLINE runJSC(VM* vm, CommandLine options)
+{
+    JSLockHolder locker(vm);
+
+    int result;
+    if (options.m_profile && !vm->m_perBytecodeProfiler)
+        vm->m_perBytecodeProfiler = std::make_unique<Profiler::Database>(*vm);
+
+    GlobalObject* globalObject = GlobalObject::create(*vm, GlobalObject::createStructure(*vm, jsNull()), options.m_arguments);
+    bool success = runWithScripts(globalObject, options.m_scripts, options.m_dump, options.m_module);
+    if (options.m_interactive && success)
+        runInteractive(globalObject);
+
+    result = success ? 0 : 3;
+
+    if (options.m_exitCode)
+        printf("jsc exiting %d\n", result);
+
+    if (options.m_profile) {
+        if (!vm->m_perBytecodeProfiler->save(options.m_profilerOutput.utf8().data()))
+            fprintf(stderr, "could not save profiler output.\n");
+    }
+
+#if ENABLE(JIT)
+    if (Options::useExceptionFuzz())
+        printf("JSC EXCEPTION FUZZ: encountered %u checks.\n", numberOfExceptionFuzzChecks());
+    bool fireAtEnabled =
+    Options::fireExecutableAllocationFuzzAt() || Options::fireExecutableAllocationFuzzAtOrAfter();
+    if (Options::useExecutableAllocationFuzz() && (!fireAtEnabled || Options::verboseExecutableAllocationFuzz()))
+        printf("JSC EXECUTABLE ALLOCATION FUZZ: encountered %u checks.\n", numberOfExecutableAllocationFuzzChecks());
+    if (Options::useOSRExitFuzz()) {
+        printf("JSC OSR EXIT FUZZ: encountered %u static checks.\n", numberOfStaticOSRExitFuzzChecks());
+        printf("JSC OSR EXIT FUZZ: encountered %u dynamic checks.\n", numberOfOSRExitFuzzChecks());
+    }
+#endif
+    auto compileTimeStats = DFG::Plan::compileTimeStats();
+    Vector<CString> compileTimeKeys;
+    for (auto& entry : compileTimeStats)
+        compileTimeKeys.append(entry.key);
+    std::sort(compileTimeKeys.begin(), compileTimeKeys.end());
+    for (CString key : compileTimeKeys)
+        printf("%40s: %.3lf ms\n", key.data(), compileTimeStats.get(key));
+
+    return result;
+}
+
 int jscmain(int argc, char** argv)
 {
@@ -2038 +2085 @@
     VM* vm = &VM::create(LargeHeap).leakRef();
     int result;
-    {
+    result = runJSC(vm, options);
+
+    if (Options::gcAtEnd()) {
+        // We need to hold the API lock to do a GC.
         JSLockHolder locker(vm);
-
-        if (options.m_profile && !vm->m_perBytecodeProfiler)
-            vm->m_perBytecodeProfiler = std::make_unique<Profiler::Database>(*vm);
-    
-        GlobalObject* globalObject = GlobalObject::create(*vm, GlobalObject::createStructure(*vm, jsNull()), options.m_arguments);
-        bool success = runWithScripts(globalObject, options.m_scripts, options.m_dump, options.m_module);
-        if (options.m_interactive && success)
-            runInteractive(globalObject);
-
-        result = success ? 0 : 3;
-
-        if (options.m_exitCode)
-            printf("jsc exiting %d\n", result);
-    
-        if (options.m_profile) {
-            if (!vm->m_perBytecodeProfiler->save(options.m_profilerOutput.utf8().data()))
-                fprintf(stderr, "could not save profiler output.\n");
-        }
-        
-#if ENABLE(JIT)
-        if (Options::useExceptionFuzz())
-            printf("JSC EXCEPTION FUZZ: encountered %u checks.\n", numberOfExceptionFuzzChecks());
-        bool fireAtEnabled =
-            Options::fireExecutableAllocationFuzzAt() || Options::fireExecutableAllocationFuzzAtOrAfter();
-        if (Options::useExecutableAllocationFuzz() && (!fireAtEnabled || Options::verboseExecutableAllocationFuzz()))
-            printf("JSC EXECUTABLE ALLOCATION FUZZ: encountered %u checks.\n", numberOfExecutableAllocationFuzzChecks());
-        if (Options::useOSRExitFuzz()) {
-            printf("JSC OSR EXIT FUZZ: encountered %u static checks.\n", numberOfStaticOSRExitFuzzChecks());
-            printf("JSC OSR EXIT FUZZ: encountered %u dynamic checks.\n", numberOfOSRExitFuzzChecks());
-        }
-#endif
-        auto compileTimeStats = DFG::Plan::compileTimeStats();
-        Vector<CString> compileTimeKeys;
-        for (auto& entry : compileTimeStats)
-            compileTimeKeys.append(entry.key);
-        std::sort(compileTimeKeys.begin(), compileTimeKeys.end());
-        for (CString key : compileTimeKeys)
-            printf("%40s: %.3lf ms\n", key.data(), compileTimeStats.get(key));
-    }
-    
+        vm->heap.collectAllGarbage();
+    }
+
     return result;
 }

trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp

@@ -75 +75 @@
     ArrayPrototype* prototype = new (NotNull, allocateCell<ArrayPrototype>(vm.heap)) ArrayPrototype(vm, structure);
     prototype->finishCreation(vm, globalObject);
+    vm.heap.addFinalizer(prototype, destroy);
     return prototype;
 }
@@ -139 +140 @@
 }
 
+void ArrayPrototype::destroy(JSC::JSCell* cell)
+{
+    ArrayPrototype* thisObject = static_cast<ArrayPrototype*>(cell);
+    thisObject->ArrayPrototype::~ArrayPrototype();
+}
+
 // ------------------------------ Array Functions ----------------------------
 

trunk/Source/JavaScriptCore/runtime/ArrayPrototype.h

@@ -49 +49 @@
     bool didChangeConstructorProperty() const { return m_didChangeConstructorProperty; }
 
+    static const bool needsDestruction = false;
+    // We don't need destruction since we use a finalizer.
+    static void destroy(JSC::JSCell*);
+
 protected:
     void finishCreation(VM&, JSGlobalObject*);

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -320 +320 @@
     v(gcLogLevel, logGC, GCLogging::None, "debugging option to log GC activity (0 = None, 1 = Basic, 2 = Verbose)") \
     v(bool, useGC, true, nullptr) \
+    v(bool, gcAtEnd, false, "If true, the jsc CLI will do a GC before exiting") \
     v(bool, forceGCSlowPaths, false, "If true, we will force all JIT fast allocations down their slow paths.")\
     v(unsigned, gcMaxHeapSize, 0, nullptr) \