C: Doesn't deal with macro nonsense #612

/* irq_work to run mmap_read_unlock() in irq_work */
struct mmap_unlock_irq_work {
	struct irq_work irq_work;
	struct mm_struct *mm;
};

DECLARE_PER_CPU(struct mmap_unlock_irq_work, mmap_unlock_work);

❯❯  mergiraf solve arch/x86/include/asm/asi.h
WARN Error while resolving conflicts: parse error at 145:0..145:47, starting with: `DECLARE_PER_CPU_ALIGNED(struct a`
WARN Full structured merge failed: parse error at 140:23..140:28, starting with: `pgd_t`
INFO 1 conflict(s) remaining.

Most nontrivial C projects have some macros that don't look like normal C syntax, e.g. here is some LInux kernel code: ```C /* irq_work to run mmap_read_unlock() in irq_work */ struct mmap_unlock_irq_work { struct irq_work irq_work; struct mm_struct *mm; }; DECLARE_PER_CPU(struct mmap_unlock_irq_work, mmap_unlock_work); ``` It appears that mergiraf isn't able to take this into account: ``` ❯❯ mergiraf solve arch/x86/include/asm/asi.h WARN Error while resolving conflicts: parse error at 145:0..145:47, starting with: `DECLARE_PER_CPU_ALIGNED(struct a` WARN Full structured merge failed: parse error at 140:23..140:28, starting with: `pgd_t` INFO 1 conflict(s) remaining. ``` (The actual code I'm compiling here isn't public right now, sorry). Is this expected? I assume Mergiraf is fundamentally unable to deal with [ab]use of the preprocessor in this style? Maybe this isn't surprising but it should probably be mentioned up-front on the language support docs page.