Changeset 269171 in webkit for trunk/Source/JavaScriptCore/offlineasm/offsets.rb

Timestamp:

Oct 29, 2020, 2:38:30 PM (5 years ago)

Author:

[email protected]

Message:

JavaScriptCore should support multiple build variants
<​https://webkit.org/b/218347>
<rdar://problem/70786057>

Patch by Jérôme Decoodt <​[email protected]> on 2020-10-29
Reviewed by Keith Miller.

Update JavaScriptCore to handle BUILD_VARIANTS properly by
passing the value to build phase scripts and handling all
variants set during the build. For engineering builds,
BUILD_VARIANTS=normal.

• CMakeLists.txt:
• Update to pass equivalent ${BUILD_VARIANTS} for non-Apple platforms to asm.rb and generate_offset_extractor.rb.

• JavaScriptCore.xcodeproj/project.pbxproj:

(LLInt Offsets | Generate Derived Sources):
(Offline Assembler | Offline Assemble):

• Update build phase script to pass "${BUILD_VARIANTS}" as an argument to scripts.

• offlineasm/asm.rb:
• Parse BUILD_VARIANTS argument to pass to offsetsAndConfigurationIndexForVariants().
• offlineasm/generate_offset_extractor.rb:
• Parse BUILD_VARIANTS argument to pass to configurationIndicesForVariants().

• offlineasm/offsets.rb:

(offsetsAndConfigurationIndex):

• Update argument list in comment block.

(offsetsAndConfigurationIndexForVariants): Add.

• Invoke offsetsAndConfigurationIndex() for each build variant.

(configurationIndices):

• Update argument list in comment block.

(configurationIndicesForVariants): Add.

• Invoke configurationIndices() for each build variant.

File:

• trunk/Source/JavaScriptCore/offlineasm/offsets.rb (modified) (3 diffs)

trunk/Source/JavaScriptCore/offlineasm/offsets.rb

@@ -140 +140 @@
 
 #
-# offsetsAndConfigurationIndex(ast, file) ->
+# offsetsAndConfigurationIndex(file) ->
 #     [[offsets, index], ...]
 #
@@ -183 +183 @@
 
 #
-# configurationIndices(ast, file) ->
+# offsetsAndConfigurationIndex(file) ->
+#     [[offsets, index], ...]
+#
+# Parses the offsets from a file and all its variants and returns a list of
+# offsets and the index of the configuration that is valid in this build target.
+#
+
+def offsetsAndConfigurationIndexForVariants(file, variants)
+    results = []
+    variants.each {
+        | current_variant |
+        suffix = ""
+        unless current_variant == "normal"
+            suffix = "_" + current_variant
+        end
+        results << offsetsAndConfigurationIndex(file + suffix)
+    }
+    return results.flatten(1)
+end
+
+#
+# configurationIndices(file) ->
 #     [[offsets, index], ...]
 #
@@ -213 +234 @@
 
 #
+# configurationIndicesForVariants(file, variants) ->
+#     [[offsets, index], ...]
+#
+# Parses the configurations from a file and all its variants and returns a list
+# of the indices of the configurations that are valid in this build target.
+#
+
+def configurationIndicesForVariants(file, variants)
+    results = []
+    variants.each {
+        | current_variant |
+        suffix = ""
+        unless current_variant == "normal"
+            suffix = "_" + current_variant
+        end
+        results << configurationIndices(file + suffix)
+    }
+    return results.flatten(1)
+end
+
+#
 # buildOffsetsMap(ast, extractedConstants) -> map
 #