Ignore:
Timestamp:
Aug 24, 2021, 9:57:27 AM (4 years ago)
Author:
[email protected]
Message:

Unreviewed, reverting r281321.
​https://bugs.webkit.org/show_bug.cgi?id=229449

causes crashes on ARM64

Reverted changeset:

"Add some offlineasm enhancements."
​https://bugs.webkit.org/show_bug.cgi?id=229332
​https://commits.webkit.org/r281321

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/offlineasm/parser.rb

    r281321 r281496  
    201201        when /\A".*"/
    202202            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
    203         when /\?/
    204             result << Token.new(CodeOrigin.new(file, lineNumber), $&)
    205203        else
    206204            raise "Lexer error at #{CodeOrigin.new(file, lineNumber).to_s}, unexpected sequence #{str[0..20].inspect}"
    … …  
    264262        @idx = 0
    265263        @annotation = nil
    266         # FIXME: CMake does not currently set BUILT_PRODUCTS_DIR.
    267         # https://bugs.webkit.org/show_bug.cgi?id=229340
    268         @buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR'];
    269264    end
    270265   
    … …  
    823818            elsif @tokens[@idx] == "include"
    824819                @idx += 1
    825                 isOptional = false
    826                 if @tokens[@idx] == "?"
    827                     isOptional = true
    828                     @idx += 1
    829                 end
    830820                parseError unless isIdentifier(@tokens[@idx])
    831821                moduleName = @tokens[@idx].string
    832                 @idx += 1
    833                 additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
    834                 fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName
    835                 if not File.exists?(fileName)
    836                     fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
    837                 end
    838                 fileExists = File.exists?(fileName)
    839                 raise "File not found: #{fileName}" if not fileExists and not isOptional
    840                 list << parse(fileName) if fileExists
     822                fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
     823                @idx += 1
     824                list << parse(fileName)
    841825            else
    842826                parseError "Expecting terminal #{final} #{comment}"
    … …  
    855839            elsif @tokens[@idx] == "include"
    856840                @idx += 1
    857                 isOptional = false
    858                 if @tokens[@idx] == "?"
    859                     isOptional = true
    860                     @idx += 1
    861                 end
    862841                parseError unless isIdentifier(@tokens[@idx])
    863842                moduleName = @tokens[@idx].string
    864                 @idx += 1
    865                 additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
    866                 fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName
    867                 if not File.exists?(fileName)
    868                     fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
    869                 end
    870                 fileExists = File.exists?(fileName)
    871                 raise "File not found: #{fileName}" if not fileExists and not isOptional
    872                 fileList << fileName if fileExists
     843                fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
     844                @idx += 1
     845               
     846                fileList << fileName
    873847            else
    874848                @idx += 1
Note: See TracChangeset for help on using the changeset viewer.