Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t

Julia Lawall
2015-06-24T21:44:52Z

> Now where my cocci foo ends is when I try to match both types in the
> same rule, i.e.
>
> @ fun exists @
> identifier hf,irq,desc;
> typedef u32;
> @@
>
> (
> void hf(unsigned irq, struct irq_desc *desc) { ... }
> |
> void hf(u32 irq, struct irq_desc *desc) { ... }
> )
>
> results in:
> Fatal error: exception Failure("minus: parse error:
> = File "../cocci/find-pot-handler.cocci", line 7, column 5, charpos = 63
> around = 'hf', whole content = void hf(unsigned irq, struct irq_desc *desc) { ... }
> ")

Yeah, sorry, it doesn't work. There is no way to put a disjunction on
a function definition or a parameter type.

> I tried a couple of other variants, but finally gave up and ran a
> cocci script first which does s/u32/unsigned/ on those functions, but
> of course because I'm lazy I wanted to do everything in one go. :)
>
> Aside of that the ruleset you gave me works nicely except for that
> part:
>
> // no uses of the first parameter before the assignment
> @@
> identifier fun.hf,irq;
> expression e;
> type T;
> fresh identifier firq = "__" ## irq;
> position r.p,p1 != {s.p1,s1.p1};
> @@
>
> hf(T@p
> - irq
> + firq
> ,...) {
> ... when != irq
> when strict
> ? irq@p1 = e
> ... when any
> }
>
> That lacks a:
>
> + unsigned int irq;
>
> and therefor missed to add the local variable 'unsigned int irq' in
> case the parameter is only used for local storage.

Oops, thanks.

julia

> That was simple enough to fix even for me :)
>
> Thanks,
>
> tglx
>
>