[Webkit-unassigned] [Bug 189552] builtins directory causes name conflict on Python 3

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=189552

Dawei Fenton (:realdawei) <realdawei at apple.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |REOPENED
                 CC|                            |realdawei at apple.com
         Resolution|FIXED                       |---

--- Comment #9 from Dawei Fenton (:realdawei) <realdawei at apple.com> ---
Seeing failures on mac High Sierra WK1 after this revision

sample output:
https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK1%20%28Tests%29/builds/7978/steps/builtins-generator-tests/logs/stdio
FAIL: JavaScriptCore-Builtin.Promise-Combined.js-result
--- JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result    2018-08-02 12:48:35.000000000 -0700
+++ /var/folders/ym/7vg3fgj53js34xvf5xr2_9k80000gn/T/tmpsIJlICbuiltin-generator-tests/JavaScriptCore-Builtin.Promise-Combined.js-result 2018-09-14 09:07:21.000000000 -0700
@@ -53,8 +53,8 @@
     macro(fulfillPromise, builtinPromiseFulfillPromise, 2) \

 #define JSC_FOREACH_BUILTIN_CODE(macro) \
-    macro(builtinPromiseRejectPromiseCode, rejectPromise, static_cast<const char*>(nullptr), s_builtinPromiseRejectPromiseCodeLength) \
     macro(builtinPromiseFulfillPromiseCode, fulfillPromise, static_cast<const char*>(nullptr), s_builtinPromiseFulfillPromiseCodeLength) \
+    macro(builtinPromiseRejectPromiseCode, rejectPromise, static_cast<const char*>(nullptr), s_builtinPromiseRejectPromiseCodeLength) \

 #define JSC_FOREACH_BUILTIN_FUNCTION_NAME(macro) \
     macro(fulfillPromise) \
@@ -115,26 +115,6 @@

 namespace JSC {

-const JSC::ConstructAbility s_builtinPromiseRejectPromiseCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_builtinPromiseRejectPromiseCodeLength = 413;
-static const JSC::Intrinsic s_builtinPromiseRejectPromiseCodeIntrinsic = JSC::NoIntrinsic;
-const char* s_builtinPromiseRejectPromiseCode =
-    "(function (promise, reason)\n" \
-    "{\n" \
-    "    \"use strict\";\n" \
-    "\n" \
-    "    var reactions = promise. at promiseRejectReactions;\n" \
-    "    promise. at promiseResult = reason;\n" \
-    "    promise. at promiseFulfillReactions = undefined;\n" \
-    "    promise. at promiseRejectReactions = undefined;\n" \
-    "    promise. at promiseState = @promiseRejected;\n" \
-    "\n" \
-    "    @InspectorInstrumentation.promiseRejected(promise, reason, reactions);\n" \
-    "\n" \
-    "    @triggerPromiseReactions(reactions, reason);\n" \
-    "})\n" \
-;
-
 const JSC::ConstructAbility s_builtinPromiseFulfillPromiseCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
 const int s_builtinPromiseFulfillPromiseCodeLength = 412;
 static const JSC::Intrinsic s_builtinPromiseFulfillPromiseCodeIntrinsic = JSC::NoIntrinsic;
@@ -155,6 +135,26 @@
     "})\n" \
 ;

+const JSC::ConstructAbility s_builtinPromiseRejectPromiseCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_builtinPromiseRejectPromiseCodeLength = 413;
+static const JSC::Intrinsic s_builtinPromiseRejectPromiseCodeIntrinsic = JSC::NoIntrinsic;
+const char* s_builtinPromiseRejectPromiseCode =
+    "(function (promise, reason)\n" \
+    "{\n" \
+    "    \"use strict\";\n" \
+    "\n" \
+    "    var reactions = promise. at promiseRejectReactions;\n" \
+    "    promise. at promiseResult = reason;\n" \
+    "    promise. at promiseFulfillReactions = undefined;\n" \
+    "    promise. at promiseRejectReactions = undefined;\n" \
+    "    promise. at promiseState = @promiseRejected;\n" \
+    "\n" \
+    "    @InspectorInstrumentation.promiseRejected(promise, reason, reactions);\n" \
+    "\n" \
+    "    @triggerPromiseReactions(reactions, reason);\n" \
+    "})\n" \
+;
+

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20180914/eeeaf43d/attachment-0001.html>