1395580 - Making a small change in /js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp breaks the parser

Status: RESOLVED FIXED

(Core :: JavaScript Engine: JIT, defect, P3)

Description

[Sylvestre Ledru [:Sylvestre]]

Writing this patch breaks the config/check_macroassembler_style.py parser:

diff --git a/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp b/js/src/jit/x8
--- a/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
+++ b/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
@@ -406,18 +406,17 @@ MacroAssemblerX86Shared::minMaxFloat32(F
 }
 
 //{{{ check_macroassembler_style
 // ===============================================================
 // MacroAssembler high-level usage.
 
 void
 MacroAssembler::flush()
-{
-}
+{}
 
 void
 MacroAssembler::comment(const char* msg)
 {
     masm.comment(msg);
 }
 
 // ===============================================================


-----
-- check_macroassembler_style.py declared syntax
+++ check_macroassembler_style.py found definitions
@@ -1365,10 +1365,9 @@
     is defined in arm64/MacroAssembler-arm64.cpp
     is defined in x64/MacroAssembler-x64.cpp
     is defined in x86/MacroAssembler-x86.cpp
-void comment(const char*) PER_SHARED_ARCH;
-    is defined in arm/MacroAssembler-arm.cpp
-    is defined in arm64/MacroAssembler-arm64.cpp
-    is defined in x86-shared/MacroAssembler-x86-shared.cpp
+void comment(const char*) DEFINED_ON(arm, arm64);
+    is defined in arm/MacroAssembler-arm.cpp
+    is defined in arm64/MacroAssembler-arm64.cpp
 void flush() PER_SHARED_ARCH;
     is defined in arm/MacroAssembler-arm.cpp
     is defined in arm64/MacroAssembler-arm64.cpp

Comment 1

[Sylvestre Ledru [:Sylvestre]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=3de32aa8fe38fc119a193eab8322b77f4839a945

Comment 2

[Nicolas B. Pierron [:nbp]]

From what I understand, this would be a priority for 58, as this would be blocking the reformatting of the code base.

This should be a minor change in ./config/check_macroassembler_style.py

Comment 3

[Sylvestre Ledru [:Sylvestre]]

Attachment: Bug 1395580 - check_macroassembler_style.py - Also manage the coding style {} for function declarations

Review commit: https://reviewboard.mozilla.org/r/180312/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/180312/

Comment 4

[Nicolas B. Pierron [:nbp]]

Comment on attachment 8908672 [details]
Bug 1395580 - check_macroassembler_style.py - Also manage the coding style {} for function declarations

https://reviewboard.mozilla.org/r/180312/#review185508

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/07c412e7cdf0
check_macroassembler_style.py - Also manage the coding style {} for function declarations r=nbp

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/07c412e7cdf0