Changeset 281972 in webkit for trunk/Source/JavaScriptCore/offlineasm/asm.rb

Timestamp:

Sep 2, 2021, 7:14:37 PM (4 years ago)

Author:

[email protected]

Message:

[JSC] Fix WebKitAdditions directory traversal in offlineasm
​https://bugs.webkit.org/show_bug.cgi?id=229841

Reviewed by Mark Lam.

When DEPLOYMENT_LOCATION is YES, WebKitAdditions directory becomes /usr/local/include/WebKitAdditions.
This patch adds --use-deployment-location option to generate_offset_extractor.rb, generate_settings_extractor.rb,
and asm.rb. And they pass it to parser to change the include directory.

• JavaScriptCore.xcodeproj/project.pbxproj:
• offlineasm/asm.rb:
• offlineasm/generate_offset_extractor.rb:
• offlineasm/generate_settings_extractor.rb:
• offlineasm/parser.rb:

File:

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

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -336 +336 @@
 $options = {}
 OptionParser.new do |opts|
-    opts.banner = "Usage: asm.rb asmFile offsetsFile outputFileName [--assembler=<ASM>]"
+    opts.banner = "Usage: asm.rb asmFile offsetsFile outputFileName [--assembler=<ASM>] [--use-deployment-location]"
     # This option is currently only used to specify the masm assembler
     opts.on("--assembler=[ASM]", "Specify an assembler to use.") do |assembler|
         $options[:assembler] = assembler
+    end
+    opts.on("--use-deployment-location", "Flag to use deployment location.") do |flag|
+        $options[:use_deployment_location] = flag
     end
 end.parse!
@@ -359 +362 @@
 
 inputHash =
-    $commentPrefix + " offlineasm input hash: " + parseHash(asmFile) +
+    $commentPrefix + " offlineasm input hash: " + parseHash(asmFile, $options) +
     " " + Digest::SHA1.hexdigest(configurationList.map{|v| (v[0] + [v[1]]).join(' ')}.join(' ')) +
     " " + selfHash +
@@ -388 +391 @@
     $asm = Assembler.new($output)
     
-    ast = parse(asmFile)
+    ast = parse(asmFile, $options)
     settingsCombinations = computeSettingsCombinations(ast)