author | Jan de Mooij <jdemooij@mozilla.com> |
Thu, 19 Apr 2018 13:02:00 +0200 | |
changeset 414535 | ff7588bba148f3f6f0bed0a88e5c94dcb102f3db |
parent 414534 | 363cc3b4dd41a2c5469fb03d72451e942687c73c |
child 414536 | 2f7d0134b22176dd649418217cb98d09ce102c83 |
push id | 33871 |
push user | csabou@mozilla.com |
push date | Thu, 19 Apr 2018 22:30:08 +0000 |
treeherder | mozilla-central@5d73549d363f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nbp |
bugs | 1064316 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
config/check_macroassembler_style.py | file | annotate | diff | comparison | revisions | |
js/src/Makefile.in | file | annotate | diff | comparison | revisions |
--- a/config/check_macroassembler_style.py +++ b/config/check_macroassembler_style.py @@ -22,19 +22,16 @@ from __future__ import print_function import difflib import os import re import sys -from mozversioncontrol import get_repository_from_env - - architecture_independent = set(['generic']) all_unsupported_architectures_names = set(['mips32', 'mips64', 'mips_shared']) all_architecture_names = set(['x86', 'x64', 'arm', 'arm64']) all_shared_architecture_names = set(['x86_shared', 'arm', 'arm64']) reBeforeArg = "(?<=[(,\s])" reArgType = "(?P<type>[\w\s:*&]+)" reArgName = "(?P<name>\s\w+)" @@ -260,29 +257,30 @@ def generate_file_content(signatures): def check_style(): # We read from the header file the signature of each function. decls = dict() # type: dict(signature => ['x86', 'x64']) # We infer from each file the signature of each MacroAssembler function. defs = dict() # type: dict(signature => ['x86', 'x64']) - with get_repository_from_env() as repo: - # Select the appropriate files. - for filename in repo.get_files_in_working_directory(): - if not filename.startswith('js/src/jit/'): - continue + root_dir = os.path.join('js', 'src', 'jit') + for dirpath, dirnames, filenames in os.walk(root_dir): + for filename in filenames: if 'MacroAssembler' not in filename: continue - filename = os.path.join(repo.path, filename) + filepath = os.path.join(dirpath, filename).replace('\\', '/') - if filename.endswith('MacroAssembler.h'): - decls = append_signatures(decls, get_macroassembler_declaration(filename)) - defs = append_signatures(defs, get_macroassembler_definitions(filename)) + if filepath.endswith('MacroAssembler.h'): + decls = append_signatures(decls, get_macroassembler_declaration(filepath)) + defs = append_signatures(defs, get_macroassembler_definitions(filepath)) + + if not decls or not defs: + raise Exception("Did not find any definitions or declarations") # Compare declarations and definitions output. difflines = difflib.unified_diff(generate_file_content(decls), generate_file_content(defs), fromfile='check_macroassembler_style.py declared syntax', tofile='check_macroassembler_style.py found definitions') ok = True for diffline in difflines:
--- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -48,17 +48,17 @@ ifdef MOZ_MSAN JITTEST_SANITIZER_ENV=MSAN_SYMBOLIZER_PATH='$(LLVM_SYMBOLIZER)' endif endif check-style:: (cd $(topsrcdir) && $(PYTHON) $(topsrcdir)/config/check_spidermonkey_style.py); check-masm:: - (cd $(srcdir) && $(PYTHON) $(topsrcdir)/config/check_macroassembler_style.py); + (cd $(topsrcdir) && $(PYTHON) $(topsrcdir)/config/check_macroassembler_style.py); check-js-msg:: (cd $(topsrcdir) && $(PYTHON) $(topsrcdir)/config/check_js_msg_encoding.py); check-opcode:: (cd $(topsrcdir) && $(PYTHON) $(topsrcdir)/config/check_js_opcode.py); check-jit-test::