Closed Bug 1183487 Opened 4 years ago Closed 4 years ago

check_macroassembler_style.py: Failure caused by unexpected sorting

Categories

(Core :: JavaScript Engine: JIT, defect)

All
Linux
defect
Not set

Tracking

()

RESOLVED FIXED
mozilla42
Tracking Status
firefox42 --- fixed

People

(Reporter: hev, Assigned: hev)

Details

Attachments

(1 file)

I am trying merge mips64 codes into master, check_macroassembler_style.py failed with mips64. Looks it caused by unexpected sorting.

logs:
--- check_macroassembler_style.py declared syntax
+++ check_macroassembler_style.py found definitions
@@ -9,17 +9,17 @@
 inline void Pop(Register) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Pop(const Operand) DEFINED_ON(x86_shared);
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
 inline void Pop(const ValueOperand&) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void PopRegsInMask(LiveGeneralRegisterSet);
     is defined in MacroAssembler-inl.h
 inline void PopRegsInMask(LiveRegisterSet);
@@ -27,51 +27,51 @@
 inline void PopRegsInMaskIgnore(LiveRegisterSet, LiveRegisterSet) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Push(ConstantOrRegister);
     is defined in MacroAssembler-inl.h
 inline void Push(FloatRegister) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Push(JSValueType, Register);
     is defined in MacroAssembler-inl.h
 inline void Push(Register) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Push(TypedOrValueRegister);
     is defined in MacroAssembler-inl.h
 inline void Push(const Imm32) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Push(const ImmGCPtr) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Push(const ImmPtr) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Push(const ImmWord) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void Push(const Operand) DEFINED_ON(x86_shared);
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
 inline void Push(const Value&);
@@ -87,9 +87,9 @@
 inline void PushRegsInMask(LiveRegisterSet) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void PushValue(const Address&);
     is defined in MacroAssembler-inl.h
 inline void adjustFrame(int32_t);
@@ -99,39 +99,39 @@
 inline void call(AsmJSImmPtr) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void call(ImmPtr) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void call(ImmWord) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void call(JitCode*) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void call(Label*) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void call(Register) PER_SHARED_ARCH;
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
     is defined in mips/MacroAssembler-mips-inl.h
+    is defined in mips64/MacroAssembler-mips64-inl.h
     is defined in arm/MacroAssembler-arm-inl.h
     is defined in arm64/MacroAssembler-arm64-inl.h
-    is defined in mips64/MacroAssembler-mips64-inl.h
 inline void call(const Address&) DEFINED_ON(x86_shared);
     is defined in x86-shared/MacroAssembler-x86-shared-inl.h
 inline void call(const CallSiteDesc&, Label*);
TEST-UNEXPECTED-FAIL | check_macroassembler_style.py | actual output does not match expected output;  diff is above
Attached patch bug1183487.patchSplinter Review
Attachment #8633276 - Flags: review?(nicolas.b.pierron)
Attachment #8633276 - Flags: review?(nicolas.b.pierron) → review+
Assignee: nobody → r
Keywords: checkin-needed
Please make sure future patches include proper commit information when requesting checkin.
https://developer.mozilla.org/en-US/docs/Mercurial_FAQ#How_can_I_generate_a_patch_for_somebody_else_to_check-in_for_me.3F
https://hg.mozilla.org/mozilla-central/rev/2b840575a497
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla42
You need to log in before you can comment on or make changes to this bug.