Revert part of GCC warning fix to fix debug build.

The typedef is used inside the DEBUG(), and apparently can't be moved
inside of it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196528 91177308-0d34-0410-b5e6-96231b3b80d8