Changeset 292454 in webkit for trunk/Source/JavaScriptCore/offlineasm/parser.rb

Timestamp:

Apr 6, 2022, 2:04:59 AM (3 years ago)

Author:

Adrian Perez de Castro

Message:

[JSC] Nested includes do not change offlineasm hash output
​https://bugs.webkit.org/show_bug.cgi?id=237779

Reviewed by Mark Lam.

The Ruby tooling around offlineasm can produce on their output a line containing a
checksum which depends on the input files processed. This is used to avoid redoing
in case the source files have not been changed since the last run. While there is
code to scan the "include" directives in the main input file and take the included
files into account for checksum calculation, included files themselves were not being
further processed for the second or additional levels of "include:. This adds the
missing recursive processing of "include" directives in order to take nested includes
into account.

• offlineasm/parser.rb: Process nested includes recursively for checksum calculation.

File:

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

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -853 +853 @@
     end
 
-    def parseIncludes(final, comment)
+    def parseIncludes(final, comment, options)
         firstCodeOrigin = @tokens[@idx].codeOrigin
         fileList = []
@@ -881 +881 @@
                 fileExists = File.exists?(fileName)
                 raise "File not found: #{fileName}" if not fileExists and not isOptional
-                fileList << fileName if fileExists
+                if fileExists
+                    parser = Parser.new(readTextFile(fileName), SourceFile.new(fileName), options)
+                    fileList << parser.parseIncludes(nil, "", options)
+                end
             else
                 @idx += 1
@@ -914 +917 @@
 def parseHash(fileName, options)
     parser = Parser.new(readTextFile(fileName), SourceFile.new(fileName), options)
-    fileList = parser.parseIncludes(nil, "")
+    fileList = parser.parseIncludes(nil, "", options)
+    fileList.flatten!
     fileListHash(fileList)
 end