Title: [260329] branches/safari-609-branch/Source/_javascript_Core
- Revision
- 260329
- Author
- [email protected]
- Date
- 2020-04-18 16:32:19 -0700 (Sat, 18 Apr 2020)
Log Message
Branch build fix after r260286
https://bugs.webkit.org/show_bug.cgi?id=210583
<rdar://problem/61943707>
The branch used ensureStillAliveHere but did not have the rename of that function in r258825,
so this effectively merges that revision, too, to make the branch and trunk more similar.
No change in behavior, just rename to successfully compile.
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):
(JSC::FTL::DFG::LowerDFGToB3::compileArrayIndexOf):
(JSC::FTL::DFG::LowerDFGToB3::compileArrayPop):
(JSC::FTL::DFG::LowerDFGToB3::compileStringCharAt):
(JSC::FTL::DFG::LowerDFGToB3::compileStringCharCodeAt):
(JSC::FTL::DFG::LowerDFGToB3::compileStringCodePointAt):
(JSC::FTL::DFG::LowerDFGToB3::compileGetByOffset):
(JSC::FTL::DFG::LowerDFGToB3::compileMultiGetByOffset):
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/_javascript_Core/ChangeLog (260328 => 260329)
--- branches/safari-609-branch/Source/_javascript_Core/ChangeLog 2020-04-18 23:23:18 UTC (rev 260328)
+++ branches/safari-609-branch/Source/_javascript_Core/ChangeLog 2020-04-18 23:32:19 UTC (rev 260329)
@@ -1,3 +1,24 @@
+2020-04-18 Alex Christensen <[email protected]>
+
+ Branch build fix after r260286
+ https://bugs.webkit.org/show_bug.cgi?id=210583
+ <rdar://problem/61943707>
+
+ The branch used ensureStillAliveHere but did not have the rename of that function in r258825,
+ so this effectively merges that revision, too, to make the branch and trunk more similar.
+
+ No change in behavior, just rename to successfully compile.
+
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileGetByVal):
+ (JSC::FTL::DFG::LowerDFGToB3::compileArrayIndexOf):
+ (JSC::FTL::DFG::LowerDFGToB3::compileArrayPop):
+ (JSC::FTL::DFG::LowerDFGToB3::compileStringCharAt):
+ (JSC::FTL::DFG::LowerDFGToB3::compileStringCharCodeAt):
+ (JSC::FTL::DFG::LowerDFGToB3::compileStringCodePointAt):
+ (JSC::FTL::DFG::LowerDFGToB3::compileGetByOffset):
+ (JSC::FTL::DFG::LowerDFGToB3::compileMultiGetByOffset):
+
2020-04-17 Alan Coon <[email protected]>
Cherry-pick r260246. rdar://problem/61943700
Modified: branches/safari-609-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (260328 => 260329)
--- branches/safari-609-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2020-04-18 23:23:18 UTC (rev 260328)
+++ branches/safari-609-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2020-04-18 23:32:19 UTC (rev 260329)
@@ -3820,7 +3820,7 @@
m_heaps.decorateFencedAccess(&m_heaps.typedArrayProperties, atomicValue);
// We have to keep base alive since that keeps storage alive.
- keepAlive(lowCell(baseEdge));
+ ensureStillAliveHere(lowCell(baseEdge));
setIntTypedArrayLoadResult(result, type);
}
@@ -4677,7 +4677,7 @@
}
// We have to keep base alive since that keeps storage alive.
- keepAlive(base);
+ ensureStillAliveHere(base);
setDouble(result);
return;
}
@@ -5045,7 +5045,7 @@
}
// We have to keep base alive since that keeps storage alive.
- keepAlive(base);
+ ensureStillAliveHere(base);
return;
}
}
@@ -5411,7 +5411,7 @@
}
// Keep the sourceArray alive at least until after anything that can GC.
- keepAlive(sourceArray);
+ ensureStillAliveHere(sourceArray);
LBasicBlock loop = m_out.newBlock();
LBasicBlock continuation = m_out.newBlock();
@@ -18169,7 +18169,7 @@
return true;
}
- void keepAlive(LValue value)
+ void ensureStillAliveHere(LValue value)
{
PatchpointValue* patchpoint = m_out.patchpoint(Void);
patchpoint->effects = Effects::none();
Modified: branches/safari-609-branch/Source/_javascript_Core/heap/HeapCell.cpp (260328 => 260329)
--- branches/safari-609-branch/Source/_javascript_Core/heap/HeapCell.cpp 2020-04-18 23:23:18 UTC (rev 260328)
+++ branches/safari-609-branch/Source/_javascript_Core/heap/HeapCell.cpp 2020-04-18 23:32:19 UTC (rev 260329)
@@ -43,7 +43,7 @@
}
#if !COMPILER(GCC_COMPATIBLE)
-NEVER_INLINE void keepAlive(const void*)
+NEVER_INLINE void ensureStillAliveHere(const void*)
{
}
#endif
Modified: branches/safari-609-branch/Source/_javascript_Core/heap/HeapCell.h (260328 => 260329)
--- branches/safari-609-branch/Source/_javascript_Core/heap/HeapCell.h 2020-04-18 23:23:18 UTC (rev 260328)
+++ branches/safari-609-branch/Source/_javascript_Core/heap/HeapCell.h 2020-04-18 23:32:19 UTC (rev 260329)
@@ -38,12 +38,12 @@
struct CellAttributes;
#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
class HeapCell {
@@ -95,7 +95,7 @@
// but not the object itself.
ALWAYS_INLINE void use() const
{
- keepAlive(this);
+ ensureStillAliveHere(this);
}
};
Modified: branches/safari-609-branch/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.cpp (260328 => 260329)
--- branches/safari-609-branch/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.cpp 2020-04-18 23:23:18 UTC (rev 260328)
+++ branches/safari-609-branch/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.cpp 2020-04-18 23:32:19 UTC (rev 260329)
@@ -428,7 +428,7 @@
JSWebAssemblyGlobal* globalValue = JSWebAssemblyGlobal::tryCreate(globalObject, vm, globalObject->webAssemblyGlobalStructure(), WTFMove(globalRef));
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;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
