Changeset 258825 in webkit

Timestamp:

Mar 22, 2020 9:57:06 PM (4 years ago)

Author:

ysuzuki@apple.com

Message:

Unreviewed, rename keepAlive to ensureStillAliveHere
​https://bugs.webkit.org/show_bug.cgi?id=209398

Based on Geoff and Mark's feedback, renaming keepAlive to ensureStillAliveHere
to make the effect of keepAlive clear.

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileAtomicsReadModifyWrite):
(JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):
(JSC::FTL::DFG::LowerDFGToB3::compilePutByVal):
(JSC::FTL::DFG::LowerDFGToB3::compileArraySlice):
(JSC::FTL::DFG::LowerDFGToB3::ensureStillAliveHere):
(JSC::FTL::DFG::LowerDFGToB3::keepAlive): Deleted.

• heap/HeapCell.cpp:

(JSC::ensureStillAliveHere):
(JSC::keepAlive): Deleted.

• heap/HeapCell.h:

(JSC::ensureStillAliveHere):
(JSC::HeapCell::use const):
(JSC::keepAlive): Deleted.

• runtime/JSCJSValue.cpp:

(JSC::ensureStillAliveHere):
(JSC::keepAlive): Deleted.

• runtime/JSCJSValue.h:

(JSC::ensureStillAliveHere):
(JSC::keepAlive): Deleted.

• wasm/js/WebAssemblyModuleRecord.cpp:

(JSC::WebAssemblyModuleRecord::link):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ftl/FTLLowerDFGToB3.cpp (modified) (5 diffs)
• heap/HeapCell.cpp (modified) (1 diff)
• heap/HeapCell.h (modified) (2 diffs)
• runtime/JSCJSValue.cpp (modified) (1 diff)
• runtime/JSCJSValue.h (modified) (2 diffs)
• wasm/js/WebAssemblyModuleRecord.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-03-22  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Unreviewed, rename keepAlive to ensureStillAliveHere
+        https://bugs.webkit.org/show_bug.cgi?id=209398
+
+        Based on Geoff and Mark's feedback, renaming keepAlive to ensureStillAliveHere
+        to make the effect of keepAlive clear.
+
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileAtomicsReadModifyWrite):
+        (JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):
+        (JSC::FTL::DFG::LowerDFGToB3::compilePutByVal):
+        (JSC::FTL::DFG::LowerDFGToB3::compileArraySlice):
+        (JSC::FTL::DFG::LowerDFGToB3::ensureStillAliveHere):
+        (JSC::FTL::DFG::LowerDFGToB3::keepAlive): Deleted.
+        * heap/HeapCell.cpp:
+        (JSC::ensureStillAliveHere):
+        (JSC::keepAlive): Deleted.
+        * heap/HeapCell.h:
+        (JSC::ensureStillAliveHere):
+        (JSC::HeapCell::use const):
+        (JSC::keepAlive): Deleted.
+        * runtime/JSCJSValue.cpp:
+        (JSC::ensureStillAliveHere):
+        (JSC::keepAlive): Deleted.
+        * runtime/JSCJSValue.h:
+        (JSC::ensureStillAliveHere):
+        (JSC::keepAlive): Deleted.
+        * wasm/js/WebAssemblyModuleRecord.cpp:
+        (JSC::WebAssemblyModuleRecord::link):
+
 2020-03-22  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -3841 +3841 @@
 
         // We have to keep base alive since that keeps storage alive.
-        keepAlive(lowCell(baseEdge));
+        ensureStillAliveHere(lowCell(baseEdge));
         setIntTypedArrayLoadResult(result, type);
     }
@@ -4727 +4727 @@
                 
                 // We have to keep base alive since that keeps storage alive.
-                keepAlive(base);
+                ensureStillAliveHere(base);
                 setDouble(result);
                 return;
@@ -5095 +5095 @@
                 
                 // We have to keep base alive since that keeps storage alive.
-                keepAlive(base);
+                ensureStillAliveHere(base);
                 return;
             }
@@ -5610 +5610 @@
 
         // Keep the sourceArray alive at least until after anything that can GC.
-        keepAlive(sourceArray);
+        ensureStillAliveHere(sourceArray);
 
         LBasicBlock loop = m_out.newBlock();
@@ -18345 +18345 @@
     }
 
-    void keepAlive(LValue value)
+    void ensureStillAliveHere(LValue value)
     {
         PatchpointValue* patchpoint = m_out.patchpoint(Void);

trunk/Source/JavaScriptCore/heap/HeapCell.cpp

@@ -45 +45 @@
 #if !COMPILER(GCC_COMPATIBLE)
 // This makes the argument opaque from the compiler.
-NEVER_INLINE void keepAlive(const void*)
+NEVER_INLINE void ensureStillAliveHere(const void*)
 {
 }

trunk/Source/JavaScriptCore/heap/HeapCell.h

@@ -39 +39 @@
 
 #if COMPILER(GCC_COMPATIBLE)
-ALWAYS_INLINE void keepAlive(const void* pointer)
+ALWAYS_INLINE void ensureStillAliveHere(const void* pointer)
 {
     asm volatile ("" : : "r"(pointer) : "memory");
 }
 #else
-JS_EXPORT_PRIVATE void keepAlive(const void*);
+JS_EXPORT_PRIVATE void ensureStillAliveHere(const void*);
 #endif
 
@@ -96 +96 @@
     ALWAYS_INLINE void use() const
     {
-        keepAlive(this);
+        ensureStillAliveHere(this);
     }
 };

trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp

@@ -430 +430 @@
 #if !COMPILER(GCC_COMPATIBLE)
 // This makes the argument opaque from the compiler.
-NEVER_INLINE void keepAlive(JSValue)
+NEVER_INLINE void ensureStillAliveHere(JSValue)
 {
 }

trunk/Source/JavaScriptCore/runtime/JSCJSValue.h

@@ -639 +639 @@
 
 #if COMPILER(GCC_COMPATIBLE)
-ALWAYS_INLINE void keepAlive(JSValue value)
+ALWAYS_INLINE void ensureStillAliveHere(JSValue value)
 {
 #if USE(JSVALUE64)
@@ -648 +648 @@
 }
 #else
-JS_EXPORT_PRIVATE void keepAlive(JSValue);
+JS_EXPORT_PRIVATE void ensureStillAliveHere(JSValue);
 #endif
 

trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp

@@ -429 +429 @@
                 scope.assertNoException();
                 m_instance->linkGlobal(vm, globalIndex, globalValue);
-                keepAlive(bitwise_cast<void*>(initialBits)); // Ensure this is kept alive while creating JSWebAssemblyGlobal.
+                ensureStillAliveHere(bitwise_cast<void*>(initialBits)); // Ensure this is kept alive while creating JSWebAssemblyGlobal.
                 break;
             }