The patch doesnt apply cleanly to llvm 3.4 nor to the git master of llvm.
I also had trouble rebuilding mesa git master when I switched to llvm git
master to try without the patch first.

I found 2 more occurences of the error.
The first one is random crashes in Antichamber.
The 2nd is a crash near the beginning of the Syberia game running under wine.