Title: [249552] trunk/Source/_javascript_Core
- Revision
- 249552
- Author
- ysuz...@apple.com
- Date
- 2019-09-05 16:21:19 -0700 (Thu, 05 Sep 2019)
Log Message
Unreviewed, follow-up after r249530 and r249509
https://bugs.webkit.org/show_bug.cgi?id=201495
Rename FTLOutput::weakPointer to alreadyRegisteredWeakPointer and alreadyRegisteredFrozenPointer.
* builtins/PromiseConstructor.js:
(nakedConstructor.Promise.resolve):
(nakedConstructor.Promise.reject):
(nakedConstructor.Promise):
(nakedConstructor.InternalPromise.resolve):
(nakedConstructor.InternalPromise.reject):
(nakedConstructor.InternalPromise):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::weakPointer):
(JSC::FTL::DFG::LowerDFGToB3::frozenPointer):
(JSC::FTL::DFG::LowerDFGToB3::weakStructure):
* ftl/FTLOutput.h:
(JSC::FTL::Output::alreadyRegisteredWeakPointer):
(JSC::FTL::Output::alreadyRegisteredFrozenPointer):
(JSC::FTL::Output::weakPointer): Deleted.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (249551 => 249552)
--- trunk/Source/_javascript_Core/ChangeLog 2019-09-05 23:16:03 UTC (rev 249551)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-09-05 23:21:19 UTC (rev 249552)
@@ -1,5 +1,28 @@
2019-09-05 Yusuke Suzuki <ysuz...@apple.com>
+ Unreviewed, follow-up after r249530 and r249509
+ https://bugs.webkit.org/show_bug.cgi?id=201495
+
+ Rename FTLOutput::weakPointer to alreadyRegisteredWeakPointer and alreadyRegisteredFrozenPointer.
+
+ * builtins/PromiseConstructor.js:
+ (nakedConstructor.Promise.resolve):
+ (nakedConstructor.Promise.reject):
+ (nakedConstructor.Promise):
+ (nakedConstructor.InternalPromise.resolve):
+ (nakedConstructor.InternalPromise.reject):
+ (nakedConstructor.InternalPromise):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::weakPointer):
+ (JSC::FTL::DFG::LowerDFGToB3::frozenPointer):
+ (JSC::FTL::DFG::LowerDFGToB3::weakStructure):
+ * ftl/FTLOutput.h:
+ (JSC::FTL::Output::alreadyRegisteredWeakPointer):
+ (JSC::FTL::Output::alreadyRegisteredFrozenPointer):
+ (JSC::FTL::Output::weakPointer): Deleted.
+
+2019-09-05 Yusuke Suzuki <ysuz...@apple.com>
+
[JSC] Generalize Get/PutPromiseInternalField for InternalFieldObjectImpl
https://bugs.webkit.org/show_bug.cgi?id=201513
Modified: trunk/Source/_javascript_Core/builtins/PromiseConstructor.js (249551 => 249552)
--- trunk/Source/_javascript_Core/builtins/PromiseConstructor.js 2019-09-05 23:16:03 UTC (rev 249551)
+++ trunk/Source/_javascript_Core/builtins/PromiseConstructor.js 2019-09-05 23:21:19 UTC (rev 249552)
@@ -230,15 +230,15 @@
if (typeof executor !== "function")
@throwTypeError("Promise constructor takes a function argument");
- var result = @createPromise(new.target, /* isInternalPromise */ false);
- var promise = result;
+ var promise = @createPromise(new.target, /* isInternalPromise */ false);
+ var capturedPromise = promise;
function @resolve(resolution) {
- return @resolvePromiseWithFirstResolvingFunctionCallCheck(promise, resolution);
+ return @resolvePromiseWithFirstResolvingFunctionCallCheck(capturedPromise, resolution);
}
function @reject(reason) {
- return @rejectPromiseWithFirstResolvingFunctionCallCheck(promise, reason);
+ return @rejectPromiseWithFirstResolvingFunctionCallCheck(capturedPromise, reason);
}
try {
@@ -247,7 +247,7 @@
@reject(error);
}
- return result;
+ return promise;
}
@nakedConstructor
@@ -258,15 +258,15 @@
if (typeof executor !== "function")
@throwTypeError("InternalPromise constructor takes a function argument");
- var result = @createPromise(new.target, /* isInternalPromise */ true);
- var promise = result;
+ var promise = @createPromise(new.target, /* isInternalPromise */ true);
+ var capturedPromise = promise;
function @resolve(resolution) {
- return @resolvePromiseWithFirstResolvingFunctionCallCheck(promise, resolution);
+ return @resolvePromiseWithFirstResolvingFunctionCallCheck(capturedPromise, resolution);
}
function @reject(reason) {
- return @rejectPromiseWithFirstResolvingFunctionCallCheck(promise, reason);
+ return @rejectPromiseWithFirstResolvingFunctionCallCheck(capturedPromise, reason);
}
try {
@@ -275,5 +275,5 @@
@reject(error);
}
- return result;
+ return promise;
}
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (249551 => 249552)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2019-09-05 23:16:03 UTC (rev 249551)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2019-09-05 23:21:19 UTC (rev 249552)
@@ -17449,12 +17449,12 @@
LValue weakPointer(JSCell* pointer)
{
addWeakReference(pointer);
- return m_out.weakPointer(m_graph, pointer);
+ return m_out.alreadyRegisteredWeakPointer(m_graph, pointer);
}
LValue frozenPointer(FrozenValue* value)
{
- return m_out.weakPointer(value);
+ return m_out.alreadyRegisteredFrozenPointer(value);
}
LValue weakStructureID(RegisteredStructure structure)
@@ -17465,7 +17465,7 @@
LValue weakStructure(RegisteredStructure structure)
{
ASSERT(!!structure.get());
- return m_out.weakPointer(m_graph, structure.get());
+ return m_out.alreadyRegisteredWeakPointer(m_graph, structure.get());
}
TypedPointer addressFor(LValue base, int operand, ptrdiff_t offset = 0)
Modified: trunk/Source/_javascript_Core/ftl/FTLOutput.h (249551 => 249552)
--- trunk/Source/_javascript_Core/ftl/FTLOutput.h 2019-09-05 23:16:03 UTC (rev 249551)
+++ trunk/Source/_javascript_Core/ftl/FTLOutput.h 2019-09-05 23:21:19 UTC (rev 249552)
@@ -104,7 +104,7 @@
LValue constBool(bool value);
LValue constInt32(int32_t value);
- LValue weakPointer(DFG::Graph& graph, JSCell* cell)
+ LValue alreadyRegisteredWeakPointer(DFG::Graph& graph, JSCell* cell)
{
ASSERT(graph.m_plan.weakReferences().contains(cell));
@@ -111,7 +111,7 @@
return constIntPtr(bitwise_cast<intptr_t>(cell));
}
- LValue weakPointer(DFG::FrozenValue* value)
+ LValue alreadyRegisteredFrozenPointer(DFG::FrozenValue* value)
{
RELEASE_ASSERT(value->value().isCell());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
