tree b860ccaef991bbd6a5ec8d31ae7cc06c1f4ee0f8
parent be5ad7dce2e20275a1c4f2d7240d1bf495b9f418
author Chris Lattner <sabre@nondot.org> 1266905811 +0000
committer Chris Lattner <sabre@nondot.org> 1266905811 +0000

merge some code.


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