If Witcher 2 has scalar spills, I'd suggest trying LLVM trunk from before
r286766 (or perhaps with that commit reverted), as there's another known bug:
SGPR spills conflict with fragment shader input interpolation (because both use
M0), and it's possible that the Mesa commit simply exposed the issue.