Fix dragonegg compilation after recent debug info changes.  Fix a test case that
broke due to other debug info patches changing the metadata output.  Note that
the fix is not perfect as I have some testcases that get assertion failures, but
hopefully it will bring some bots back to life.


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