Instead of:

"... let the interrupt occur, simply set a flag in the interrupt subroutine, and poll for the flag after exiting the critical section of code."

you can directly poll the HW flag corresponding to the particular interrupt source (of course the interrupts should be disabled).

Alfredo.