From: David Majnemer <david.majnemer@gmail.com>
Date: Sun, 15 Mar 2015 01:30:58 +0000 (+0000)
Subject: llvm-cxxdump: Rename llvm-vtabledump to llvm-cxxdump
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c976146d3133884cd6326ab9f262e5dbc67187c5;p=oota-llvm.git

llvm-cxxdump: Rename llvm-vtabledump to llvm-cxxdump

llvm-vtabledump has grown enough functionality not related to vtables
that it deserves a name which is more descriptive.

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

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f85a1d97e90..5a97ee720bd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -28,6 +28,7 @@ set(LLVM_TEST_DEPENDS
           llvm-bcanalyzer
           llvm-c-test
           llvm-cov
+          llvm-cxxdump
           llvm-diff
           llvm-dis
           llvm-dsymutil
@@ -46,7 +47,6 @@ set(LLVM_TEST_DEPENDS
           llvm-size
           llvm-symbolizer
           llvm-tblgen
-          llvm-vtabledump
           macho-dump
           opt
           FileCheck
diff --git a/test/lit.cfg b/test/lit.cfg
index 197b4582979..70f83fd0072 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -41,7 +41,7 @@ config.test_format = lit.formats.ShTest(execute_external)
 
 # suffixes: A list of file extensions to treat as test files. This is overriden
 # by individual lit.local.cfg files in the test subdirectories.
-config.suffixes = ['.ll', '.c', '.cpp', '.test', '.txt', '.s']
+config.suffixes = ['.ll', '.c', '.cxx', '.test', '.txt', '.s']
 
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent
@@ -228,6 +228,7 @@ for pattern in [r"\bbugpoint\b(?!-)",
                 r"\bllvm-bcanalyzer\b",
                 r"\bllvm-config\b",
                 r"\bllvm-cov\b",
+                r"\bllvm-cxxdump\b",
                 r"\bllvm-diff\b",
                 r"\bllvm-dis\b",
                 r"\bllvm-dsymutil\b",
@@ -246,7 +247,6 @@ for pattern in [r"\bbugpoint\b(?!-)",
                 r"\bllvm-rtdyld\b",
                 r"\bllvm-size\b",
                 r"\bllvm-tblgen\b",
-                r"\bllvm-vtabledump\b",
                 r"\bllvm-c-test\b",
                 r"\bmacho-dump\b",
                 NOJUNK + r"\bopt\b",
diff --git a/test/tools/llvm-cxxdump/Inputs/eh.obj.coff-i386 b/test/tools/llvm-cxxdump/Inputs/eh.obj.coff-i386
new file mode 100644
index 00000000000..f34a079bdb8
Binary files /dev/null and b/test/tools/llvm-cxxdump/Inputs/eh.obj.coff-i386 differ
diff --git a/test/tools/llvm-cxxdump/Inputs/trivial.obj.coff-i386 b/test/tools/llvm-cxxdump/Inputs/trivial.obj.coff-i386
new file mode 100644
index 00000000000..3b9395583eb
Binary files /dev/null and b/test/tools/llvm-cxxdump/Inputs/trivial.obj.coff-i386 differ
diff --git a/test/tools/llvm-cxxdump/Inputs/trivial.obj.elf-i386 b/test/tools/llvm-cxxdump/Inputs/trivial.obj.elf-i386
new file mode 100644
index 00000000000..1a5c929b082
Binary files /dev/null and b/test/tools/llvm-cxxdump/Inputs/trivial.obj.elf-i386 differ
diff --git a/test/tools/llvm-cxxdump/eh.test b/test/tools/llvm-cxxdump/eh.test
new file mode 100644
index 00000000000..b323b05defe
--- /dev/null
+++ b/test/tools/llvm-cxxdump/eh.test
@@ -0,0 +1,258 @@
+RUN: llvm-cxxdump %p/Inputs/eh.obj.coff-i386 \
+RUN:   | FileCheck %s --check-prefix=COFF-I386
+
+
+COFF-I386: ??_R0?AUA@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0?AUA@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0?AUA@@@8[MangledName]: .?AUA@@
+COFF-I386: ??_R0?AUB@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0?AUB@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0?AUB@@@8[MangledName]: .?AUB@@
+COFF-I386: ??_R0?AUC@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0?AUC@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0?AUC@@@8[MangledName]: .?AUC@@
+COFF-I386: ??_R0?AUM@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0?AUM@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0?AUM@@@8[MangledName]: .?AUM@@
+COFF-I386: ??_R0?AUS@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0?AUS@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0?AUS@@@8[MangledName]: .?AUS@@
+COFF-I386: ??_R0?AW4E@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0?AW4E@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0?AW4E@@@8[MangledName]: .?AW4E@@
+COFF-I386: ??_R0PAUA@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0PAUA@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0PAUA@@@8[MangledName]: .PAUA@@
+COFF-I386: ??_R0PAUC@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0PAUC@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0PAUC@@@8[MangledName]: .PAUC@@
+COFF-I386: ??_R0PAUS@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0PAUS@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0PAUS@@@8[MangledName]: .PAUS@@
+COFF-I386: ??_R0PAW4E@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0PAW4E@@@8[AlwaysZero]: 0
+COFF-I386: ??_R0PAW4E@@@8[MangledName]: .PAW4E@@
+COFF-I386: ??_R0PAX@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0PAX@8[AlwaysZero]: 0
+COFF-I386: ??_R0PAX@8[MangledName]: .PAX
+COFF-I386: ??_R0PQS@@H@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386: ??_R0PQS@@H@8[AlwaysZero]: 0
+COFF-I386: ??_R0PQS@@H@8[MangledName]: .PQS@@H
+COFF-I386: __TI1?AW4E@@[Flags]: 0
+COFF-I386: __TI1?AW4E@@[Flags.Const]: false
+COFF-I386: __TI1?AW4E@@[Flags.Volatile]: false
+COFF-I386: __TI1?AW4E@@[CleanupFn]: null
+COFF-I386: __TI1?AW4E@@[ForwardCompat]: null
+COFF-I386: __TI1?AW4E@@[CatchableTypeArray]: __CTA1?AW4E@@
+COFF-I386: __TI1PQS@@H[Flags]: 0
+COFF-I386: __TI1PQS@@H[Flags.Const]: false
+COFF-I386: __TI1PQS@@H[Flags.Volatile]: false
+COFF-I386: __TI1PQS@@H[CleanupFn]: null
+COFF-I386: __TI1PQS@@H[ForwardCompat]: null
+COFF-I386: __TI1PQS@@H[CatchableTypeArray]: __CTA1PQS@@H
+COFF-I386: __TI2CPAW4E@@[Flags]: 1
+COFF-I386: __TI2CPAW4E@@[Flags.Const]: true
+COFF-I386: __TI2CPAW4E@@[Flags.Volatile]: false
+COFF-I386: __TI2CPAW4E@@[CleanupFn]: null
+COFF-I386: __TI2CPAW4E@@[ForwardCompat]: null
+COFF-I386: __TI2CPAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
+COFF-I386: __TI2CVPAW4E@@[Flags]: 3
+COFF-I386: __TI2CVPAW4E@@[Flags.Const]: true
+COFF-I386: __TI2CVPAW4E@@[Flags.Volatile]: true
+COFF-I386: __TI2CVPAW4E@@[CleanupFn]: null
+COFF-I386: __TI2CVPAW4E@@[ForwardCompat]: null
+COFF-I386: __TI2CVPAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
+COFF-I386: __TI2PAW4E@@[Flags]: 0
+COFF-I386: __TI2PAW4E@@[Flags.Const]: false
+COFF-I386: __TI2PAW4E@@[Flags.Volatile]: false
+COFF-I386: __TI2PAW4E@@[CleanupFn]: null
+COFF-I386: __TI2PAW4E@@[ForwardCompat]: null
+COFF-I386: __TI2PAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
+COFF-I386: __TI2PAX[Flags]: 0
+COFF-I386: __TI2PAX[Flags.Const]: false
+COFF-I386: __TI2PAX[Flags.Volatile]: false
+COFF-I386: __TI2PAX[CleanupFn]: null
+COFF-I386: __TI2PAX[ForwardCompat]: null
+COFF-I386: __TI2PAX[CatchableTypeArray]: __CTA2PAX
+COFF-I386: __TI2VPAW4E@@[Flags]: 2
+COFF-I386: __TI2VPAW4E@@[Flags.Const]: false
+COFF-I386: __TI2VPAW4E@@[Flags.Volatile]: true
+COFF-I386: __TI2VPAW4E@@[CleanupFn]: null
+COFF-I386: __TI2VPAW4E@@[ForwardCompat]: null
+COFF-I386: __TI2VPAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
+COFF-I386: __TI3?AUM@@[Flags]: 0
+COFF-I386: __TI3?AUM@@[Flags.Const]: false
+COFF-I386: __TI3?AUM@@[Flags.Volatile]: false
+COFF-I386: __TI3?AUM@@[CleanupFn]: null
+COFF-I386: __TI3?AUM@@[ForwardCompat]: null
+COFF-I386: __TI3?AUM@@[CatchableTypeArray]: __CTA3?AUM@@
+COFF-I386: __TI3?AUS@@[Flags]: 0
+COFF-I386: __TI3?AUS@@[Flags.Const]: false
+COFF-I386: __TI3?AUS@@[Flags.Volatile]: false
+COFF-I386: __TI3?AUS@@[CleanupFn]: ??1S@@UAE@XZ
+COFF-I386: __TI3?AUS@@[ForwardCompat]: null
+COFF-I386: __TI3?AUS@@[CatchableTypeArray]: __CTA3?AUS@@
+COFF-I386: __TI4CPAUS@@[Flags]: 1
+COFF-I386: __TI4CPAUS@@[Flags.Const]: true
+COFF-I386: __TI4CPAUS@@[Flags.Volatile]: false
+COFF-I386: __TI4CPAUS@@[CleanupFn]: null
+COFF-I386: __TI4CPAUS@@[ForwardCompat]: null
+COFF-I386: __TI4CPAUS@@[CatchableTypeArray]: __CTA4PAUS@@
+COFF-I386: __TI4CVPAUS@@[Flags]: 3
+COFF-I386: __TI4CVPAUS@@[Flags.Const]: true
+COFF-I386: __TI4CVPAUS@@[Flags.Volatile]: true
+COFF-I386: __TI4CVPAUS@@[CleanupFn]: null
+COFF-I386: __TI4CVPAUS@@[ForwardCompat]: null
+COFF-I386: __TI4CVPAUS@@[CatchableTypeArray]: __CTA4PAUS@@
+COFF-I386: __TI4PAUS@@[Flags]: 0
+COFF-I386: __TI4PAUS@@[Flags.Const]: false
+COFF-I386: __TI4PAUS@@[Flags.Volatile]: false
+COFF-I386: __TI4PAUS@@[CleanupFn]: null
+COFF-I386: __TI4PAUS@@[ForwardCompat]: null
+COFF-I386: __TI4PAUS@@[CatchableTypeArray]: __CTA4PAUS@@
+COFF-I386: __TI4VPAUS@@[Flags]: 2
+COFF-I386: __TI4VPAUS@@[Flags.Const]: false
+COFF-I386: __TI4VPAUS@@[Flags.Volatile]: true
+COFF-I386: __TI4VPAUS@@[CleanupFn]: null
+COFF-I386: __TI4VPAUS@@[ForwardCompat]: null
+COFF-I386: __TI4VPAUS@@[CatchableTypeArray]: __CTA4PAUS@@
+COFF-I386: __CTA1?AW4E@@[NumEntries]: 1
+COFF-I386: __CTA1?AW4E@@[0]: __CT??_R0?AW4E@@@84
+COFF-I386: __CTA1PQS@@H[NumEntries]: 1
+COFF-I386: __CTA1PQS@@H[0]: __CT??_R0PQS@@H@88
+COFF-I386: __CTA2PAW4E@@[NumEntries]: 2
+COFF-I386: __CTA2PAW4E@@[0]: __CT??_R0PAW4E@@@84
+COFF-I386: __CTA2PAW4E@@[1]: __CT??_R0PAX@84
+COFF-I386: __CTA2PAX[NumEntries]: 2
+COFF-I386: __CTA2PAX[0]: __CT??_R0PAX@84
+COFF-I386: __CTA2PAX[1]: __CT??_R0PAX@84
+COFF-I386: __CTA3?AUM@@[NumEntries]: 3
+COFF-I386: __CTA3?AUM@@[0]: __CT??_R0?AUM@@@88
+COFF-I386: __CTA3?AUM@@[1]: __CT??_R0?AUA@@@84
+COFF-I386: __CTA3?AUM@@[2]: __CT??_R0?AUB@@@844
+COFF-I386: __CTA3?AUS@@[NumEntries]: 3
+COFF-I386: __CTA3?AUS@@[0]: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16
+COFF-I386: __CTA3?AUS@@[1]: __CT??_R0?AUA@@@84044
+COFF-I386: __CTA3?AUS@@[2]: __CT??_R0?AUC@@@84048
+COFF-I386: __CTA4PAUS@@[NumEntries]: 4
+COFF-I386: __CTA4PAUS@@[0]: __CT??_R0PAUS@@@84
+COFF-I386: __CTA4PAUS@@[1]: __CT??_R0PAUA@@@84044
+COFF-I386: __CTA4PAUS@@[2]: __CT??_R0PAUC@@@84048
+COFF-I386: __CTA4PAUS@@[3]: __CT??_R0PAX@84
+COFF-I386: __CT??_R0?AUA@@@84[Flags]: 0
+COFF-I386: __CT??_R0?AUA@@@84[Flags.ScalarType]: false
+COFF-I386: __CT??_R0?AUA@@@84[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0?AUA@@@84[TypeDescriptor]: ??_R0?AUA@@@8
+COFF-I386: __CT??_R0?AUA@@@84[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUA@@@84[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0?AUA@@@84[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUA@@@84[Size]: 4
+COFF-I386: __CT??_R0?AUA@@@84[CopyCtor]: null
+COFF-I386: __CT??_R0?AUA@@@84044[Flags]: 0
+COFF-I386: __CT??_R0?AUA@@@84044[Flags.ScalarType]: false
+COFF-I386: __CT??_R0?AUA@@@84044[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0?AUA@@@84044[TypeDescriptor]: ??_R0?AUA@@@8
+COFF-I386: __CT??_R0?AUA@@@84044[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUA@@@84044[VirtualBasePointerOffset]: 4
+COFF-I386: __CT??_R0?AUA@@@84044[VirtualBaseAdjustmentOffset]: 4
+COFF-I386: __CT??_R0?AUA@@@84044[Size]: 4
+COFF-I386: __CT??_R0?AUA@@@84044[CopyCtor]: null
+COFF-I386: __CT??_R0?AUB@@@844[Flags]: 0
+COFF-I386: __CT??_R0?AUB@@@844[Flags.ScalarType]: false
+COFF-I386: __CT??_R0?AUB@@@844[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0?AUB@@@844[TypeDescriptor]: ??_R0?AUB@@@8
+COFF-I386: __CT??_R0?AUB@@@844[NonVirtualBaseAdjustmentOffset]: 4
+COFF-I386: __CT??_R0?AUB@@@844[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0?AUB@@@844[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUB@@@844[Size]: 4
+COFF-I386: __CT??_R0?AUB@@@844[CopyCtor]: null
+COFF-I386: __CT??_R0?AUC@@@84048[Flags]: 0
+COFF-I386: __CT??_R0?AUC@@@84048[Flags.ScalarType]: false
+COFF-I386: __CT??_R0?AUC@@@84048[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0?AUC@@@84048[TypeDescriptor]: ??_R0?AUC@@@8
+COFF-I386: __CT??_R0?AUC@@@84048[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUC@@@84048[VirtualBasePointerOffset]: 4
+COFF-I386: __CT??_R0?AUC@@@84048[VirtualBaseAdjustmentOffset]: 8
+COFF-I386: __CT??_R0?AUC@@@84048[Size]: 4
+COFF-I386: __CT??_R0?AUC@@@84048[CopyCtor]: null
+COFF-I386: __CT??_R0?AUM@@@88[Flags]: 0
+COFF-I386: __CT??_R0?AUM@@@88[Flags.ScalarType]: false
+COFF-I386: __CT??_R0?AUM@@@88[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0?AUM@@@88[TypeDescriptor]: ??_R0?AUM@@@8
+COFF-I386: __CT??_R0?AUM@@@88[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUM@@@88[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0?AUM@@@88[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUM@@@88[Size]: 8
+COFF-I386: __CT??_R0?AUM@@@88[CopyCtor]: null
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Flags]: 4
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Flags.ScalarType]: false
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Flags.VirtualInheritance]: true
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[TypeDescriptor]: ??_R0?AUS@@@8
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Size]: 16
+COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[CopyCtor]: ??0S@@QAE@ABU0@@Z
+COFF-I386: __CT??_R0?AW4E@@@84[Flags]: 1
+COFF-I386: __CT??_R0?AW4E@@@84[Flags.ScalarType]: true
+COFF-I386: __CT??_R0?AW4E@@@84[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0?AW4E@@@84[TypeDescriptor]: ??_R0?AW4E@@@8
+COFF-I386: __CT??_R0?AW4E@@@84[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AW4E@@@84[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0?AW4E@@@84[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0?AW4E@@@84[Size]: 4
+COFF-I386: __CT??_R0?AW4E@@@84[CopyCtor]: null
+COFF-I386: __CT??_R0PAUA@@@84044[Flags]: 1
+COFF-I386: __CT??_R0PAUA@@@84044[Flags.ScalarType]: true
+COFF-I386: __CT??_R0PAUA@@@84044[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0PAUA@@@84044[TypeDescriptor]: ??_R0PAUA@@@8
+COFF-I386: __CT??_R0PAUA@@@84044[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAUA@@@84044[VirtualBasePointerOffset]: 4
+COFF-I386: __CT??_R0PAUA@@@84044[VirtualBaseAdjustmentOffset]: 4
+COFF-I386: __CT??_R0PAUA@@@84044[Size]: 4
+COFF-I386: __CT??_R0PAUA@@@84044[CopyCtor]: null
+COFF-I386: __CT??_R0PAUC@@@84048[Flags]: 1
+COFF-I386: __CT??_R0PAUC@@@84048[Flags.ScalarType]: true
+COFF-I386: __CT??_R0PAUC@@@84048[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0PAUC@@@84048[TypeDescriptor]: ??_R0PAUC@@@8
+COFF-I386: __CT??_R0PAUC@@@84048[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAUC@@@84048[VirtualBasePointerOffset]: 4
+COFF-I386: __CT??_R0PAUC@@@84048[VirtualBaseAdjustmentOffset]: 8
+COFF-I386: __CT??_R0PAUC@@@84048[Size]: 4
+COFF-I386: __CT??_R0PAUC@@@84048[CopyCtor]: null
+COFF-I386: __CT??_R0PAUS@@@84[Flags]: 5
+COFF-I386: __CT??_R0PAUS@@@84[Flags.ScalarType]: true
+COFF-I386: __CT??_R0PAUS@@@84[Flags.VirtualInheritance]: true
+COFF-I386: __CT??_R0PAUS@@@84[TypeDescriptor]: ??_R0PAUS@@@8
+COFF-I386: __CT??_R0PAUS@@@84[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAUS@@@84[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0PAUS@@@84[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAUS@@@84[Size]: 4
+COFF-I386: __CT??_R0PAUS@@@84[CopyCtor]: null
+COFF-I386: __CT??_R0PAW4E@@@84[Flags]: 1
+COFF-I386: __CT??_R0PAW4E@@@84[Flags.ScalarType]: true
+COFF-I386: __CT??_R0PAW4E@@@84[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0PAW4E@@@84[TypeDescriptor]: ??_R0PAW4E@@@8
+COFF-I386: __CT??_R0PAW4E@@@84[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAW4E@@@84[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0PAW4E@@@84[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAW4E@@@84[Size]: 4
+COFF-I386: __CT??_R0PAW4E@@@84[CopyCtor]: null
+COFF-I386: __CT??_R0PAX@84[Flags]: 1
+COFF-I386: __CT??_R0PAX@84[Flags.ScalarType]: true
+COFF-I386: __CT??_R0PAX@84[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0PAX@84[TypeDescriptor]: ??_R0PAX@8
+COFF-I386: __CT??_R0PAX@84[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAX@84[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0PAX@84[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PAX@84[Size]: 4
+COFF-I386: __CT??_R0PAX@84[CopyCtor]: null
+COFF-I386: __CT??_R0PQS@@H@88[Flags]: 1
+COFF-I386: __CT??_R0PQS@@H@88[Flags.ScalarType]: true
+COFF-I386: __CT??_R0PQS@@H@88[Flags.VirtualInheritance]: false
+COFF-I386: __CT??_R0PQS@@H@88[TypeDescriptor]: ??_R0PQS@@H@8
+COFF-I386: __CT??_R0PQS@@H@88[NonVirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PQS@@H@88[VirtualBasePointerOffset]: -1
+COFF-I386: __CT??_R0PQS@@H@88[VirtualBaseAdjustmentOffset]: 0
+COFF-I386: __CT??_R0PQS@@H@88[Size]: 8
+COFF-I386: __CT??_R0PQS@@H@88[CopyCtor]: null
diff --git a/test/tools/llvm-cxxdump/trivial.test b/test/tools/llvm-cxxdump/trivial.test
new file mode 100644
index 00000000000..450ed3b3780
--- /dev/null
+++ b/test/tools/llvm-cxxdump/trivial.test
@@ -0,0 +1,58 @@
+RUN: llvm-cxxdump %p/Inputs/trivial.obj.coff-i386 \
+RUN:   | FileCheck %s --check-prefix=COFF-I386
+
+RUN: llvm-cxxdump %p/Inputs/trivial.obj.elf-i386 \
+RUN:   | FileCheck %s --check-prefix=ELF-I386
+
+COFF-I386:      ??_7S@@6B@[0]: ??_R4S@@6B@
+COFF-I386-NEXT: ??_7S@@6B@[4]: ??_GS@@UAEPAXI@Z
+COFF-I386-NEXT: ??_8S@@7B@[0]: -4
+COFF-I386-NEXT: ??_8S@@7B@[4]: 4
+COFF-I386-NEXT: ??_R4S@@6B@[IsImageRelative]: 0
+COFF-I386-NEXT: ??_R4S@@6B@[OffsetToTop]: 0
+COFF-I386-NEXT: ??_R4S@@6B@[VFPtrOffset]: 0
+COFF-I386-NEXT: ??_R4S@@6B@[TypeDescriptor]: ??_R0?AUS@@@8
+COFF-I386-NEXT: ??_R4S@@6B@[ClassHierarchyDescriptor]: ??_R3S@@8
+COFF-I386-NEXT: ??_R3A@@8[AlwaysZero]: 0
+COFF-I386-NEXT: ??_R3A@@8[Flags]: 0
+COFF-I386-NEXT: ??_R3A@@8[NumClasses]: 1
+COFF-I386-NEXT: ??_R3A@@8[BaseClassArray]: ??_R2A@@8
+COFF-I386-NEXT: ??_R3S@@8[AlwaysZero]: 0
+COFF-I386-NEXT: ??_R3S@@8[Flags]: 0
+COFF-I386-NEXT: ??_R3S@@8[NumClasses]: 2
+COFF-I386-NEXT: ??_R3S@@8[BaseClassArray]: ??_R2S@@8
+COFF-I386-NEXT: ??_R2A@@8[0]: ??_R1A@?0A@EA@A@@8
+COFF-I386-NEXT: ??_R2S@@8[0]: ??_R1A@?0A@EA@S@@8
+COFF-I386-NEXT: ??_R2S@@8[4]: ??_R1A@33FA@A@@8
+COFF-I386-NEXT: ??_R1A@33FA@A@@8[TypeDescriptor]: ??_R0?AUA@@@8
+COFF-I386-NEXT: ??_R1A@33FA@A@@8[NumBases]: 0
+COFF-I386-NEXT: ??_R1A@33FA@A@@8[OffsetInVBase]: 0
+COFF-I386-NEXT: ??_R1A@33FA@A@@8[VBPtrOffset]: 4
+COFF-I386-NEXT: ??_R1A@33FA@A@@8[OffsetInVBTable]: 4
+COFF-I386-NEXT: ??_R1A@33FA@A@@8[Flags]: 80
+COFF-I386-NEXT: ??_R1A@33FA@A@@8[ClassHierarchyDescriptor]: ??_R3A@@8
+COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[TypeDescriptor]: ??_R0?AUA@@@8
+COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[NumBases]: 0
+COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[OffsetInVBase]: 0
+COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[VBPtrOffset]: -1
+COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[OffsetInVBTable]: 0
+COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[Flags]: 64
+COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[ClassHierarchyDescriptor]: ??_R3A@@8
+COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[TypeDescriptor]: ??_R0?AUS@@@8
+COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[NumBases]: 1
+COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[OffsetInVBase]: 0
+COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[VBPtrOffset]: -1
+COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[OffsetInVBTable]: 0
+COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[Flags]: 64
+COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[ClassHierarchyDescriptor]: ??_R3S@@8
+COFF-I386-NEXT: ??_R0?AUA@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386-NEXT: ??_R0?AUA@@@8[AlwaysZero]: 0
+COFF-I386-NEXT: ??_R0?AUA@@@8[MangledName]: .?AUA@@
+COFF-I386-NEXT: ??_R0?AUS@@@8[VFPtr]: ??_7type_info@@6B@
+COFF-I386-NEXT: ??_R0?AUS@@@8[AlwaysZero]: 0
+COFF-I386-NEXT: ??_R0?AUS@@@8[MangledName]: .?AUS@@
+
+ELF-I386:      _ZTS1A: 1A
+ELF-I386-NEXT: _ZTV1A[0]: 0
+ELF-I386-NEXT: _ZTV1A[4]: _ZTI1A
+ELF-I386-NEXT: _ZTV1A[8]: _ZN1A1fEv
diff --git a/test/tools/llvm-vtabledump/Inputs/eh.obj.coff-i386 b/test/tools/llvm-vtabledump/Inputs/eh.obj.coff-i386
deleted file mode 100644
index f34a079bdb8..00000000000
Binary files a/test/tools/llvm-vtabledump/Inputs/eh.obj.coff-i386 and /dev/null differ
diff --git a/test/tools/llvm-vtabledump/Inputs/trivial.obj.coff-i386 b/test/tools/llvm-vtabledump/Inputs/trivial.obj.coff-i386
deleted file mode 100644
index 3b9395583eb..00000000000
Binary files a/test/tools/llvm-vtabledump/Inputs/trivial.obj.coff-i386 and /dev/null differ
diff --git a/test/tools/llvm-vtabledump/Inputs/trivial.obj.elf-i386 b/test/tools/llvm-vtabledump/Inputs/trivial.obj.elf-i386
deleted file mode 100644
index 1a5c929b082..00000000000
Binary files a/test/tools/llvm-vtabledump/Inputs/trivial.obj.elf-i386 and /dev/null differ
diff --git a/test/tools/llvm-vtabledump/eh.test b/test/tools/llvm-vtabledump/eh.test
deleted file mode 100644
index 1c43e0e7f65..00000000000
--- a/test/tools/llvm-vtabledump/eh.test
+++ /dev/null
@@ -1,258 +0,0 @@
-RUN: llvm-vtabledump %p/Inputs/eh.obj.coff-i386 \
-RUN:   | FileCheck %s --check-prefix=COFF-I386
-
-
-COFF-I386: ??_R0?AUA@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0?AUA@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0?AUA@@@8[MangledName]: .?AUA@@
-COFF-I386: ??_R0?AUB@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0?AUB@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0?AUB@@@8[MangledName]: .?AUB@@
-COFF-I386: ??_R0?AUC@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0?AUC@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0?AUC@@@8[MangledName]: .?AUC@@
-COFF-I386: ??_R0?AUM@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0?AUM@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0?AUM@@@8[MangledName]: .?AUM@@
-COFF-I386: ??_R0?AUS@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0?AUS@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0?AUS@@@8[MangledName]: .?AUS@@
-COFF-I386: ??_R0?AW4E@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0?AW4E@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0?AW4E@@@8[MangledName]: .?AW4E@@
-COFF-I386: ??_R0PAUA@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0PAUA@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0PAUA@@@8[MangledName]: .PAUA@@
-COFF-I386: ??_R0PAUC@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0PAUC@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0PAUC@@@8[MangledName]: .PAUC@@
-COFF-I386: ??_R0PAUS@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0PAUS@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0PAUS@@@8[MangledName]: .PAUS@@
-COFF-I386: ??_R0PAW4E@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0PAW4E@@@8[AlwaysZero]: 0
-COFF-I386: ??_R0PAW4E@@@8[MangledName]: .PAW4E@@
-COFF-I386: ??_R0PAX@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0PAX@8[AlwaysZero]: 0
-COFF-I386: ??_R0PAX@8[MangledName]: .PAX
-COFF-I386: ??_R0PQS@@H@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386: ??_R0PQS@@H@8[AlwaysZero]: 0
-COFF-I386: ??_R0PQS@@H@8[MangledName]: .PQS@@H
-COFF-I386: __TI1?AW4E@@[Flags]: 0
-COFF-I386: __TI1?AW4E@@[Flags.Const]: false
-COFF-I386: __TI1?AW4E@@[Flags.Volatile]: false
-COFF-I386: __TI1?AW4E@@[CleanupFn]: null
-COFF-I386: __TI1?AW4E@@[ForwardCompat]: null
-COFF-I386: __TI1?AW4E@@[CatchableTypeArray]: __CTA1?AW4E@@
-COFF-I386: __TI1PQS@@H[Flags]: 0
-COFF-I386: __TI1PQS@@H[Flags.Const]: false
-COFF-I386: __TI1PQS@@H[Flags.Volatile]: false
-COFF-I386: __TI1PQS@@H[CleanupFn]: null
-COFF-I386: __TI1PQS@@H[ForwardCompat]: null
-COFF-I386: __TI1PQS@@H[CatchableTypeArray]: __CTA1PQS@@H
-COFF-I386: __TI2CPAW4E@@[Flags]: 1
-COFF-I386: __TI2CPAW4E@@[Flags.Const]: true
-COFF-I386: __TI2CPAW4E@@[Flags.Volatile]: false
-COFF-I386: __TI2CPAW4E@@[CleanupFn]: null
-COFF-I386: __TI2CPAW4E@@[ForwardCompat]: null
-COFF-I386: __TI2CPAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
-COFF-I386: __TI2CVPAW4E@@[Flags]: 3
-COFF-I386: __TI2CVPAW4E@@[Flags.Const]: true
-COFF-I386: __TI2CVPAW4E@@[Flags.Volatile]: true
-COFF-I386: __TI2CVPAW4E@@[CleanupFn]: null
-COFF-I386: __TI2CVPAW4E@@[ForwardCompat]: null
-COFF-I386: __TI2CVPAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
-COFF-I386: __TI2PAW4E@@[Flags]: 0
-COFF-I386: __TI2PAW4E@@[Flags.Const]: false
-COFF-I386: __TI2PAW4E@@[Flags.Volatile]: false
-COFF-I386: __TI2PAW4E@@[CleanupFn]: null
-COFF-I386: __TI2PAW4E@@[ForwardCompat]: null
-COFF-I386: __TI2PAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
-COFF-I386: __TI2PAX[Flags]: 0
-COFF-I386: __TI2PAX[Flags.Const]: false
-COFF-I386: __TI2PAX[Flags.Volatile]: false
-COFF-I386: __TI2PAX[CleanupFn]: null
-COFF-I386: __TI2PAX[ForwardCompat]: null
-COFF-I386: __TI2PAX[CatchableTypeArray]: __CTA2PAX
-COFF-I386: __TI2VPAW4E@@[Flags]: 2
-COFF-I386: __TI2VPAW4E@@[Flags.Const]: false
-COFF-I386: __TI2VPAW4E@@[Flags.Volatile]: true
-COFF-I386: __TI2VPAW4E@@[CleanupFn]: null
-COFF-I386: __TI2VPAW4E@@[ForwardCompat]: null
-COFF-I386: __TI2VPAW4E@@[CatchableTypeArray]: __CTA2PAW4E@@
-COFF-I386: __TI3?AUM@@[Flags]: 0
-COFF-I386: __TI3?AUM@@[Flags.Const]: false
-COFF-I386: __TI3?AUM@@[Flags.Volatile]: false
-COFF-I386: __TI3?AUM@@[CleanupFn]: null
-COFF-I386: __TI3?AUM@@[ForwardCompat]: null
-COFF-I386: __TI3?AUM@@[CatchableTypeArray]: __CTA3?AUM@@
-COFF-I386: __TI3?AUS@@[Flags]: 0
-COFF-I386: __TI3?AUS@@[Flags.Const]: false
-COFF-I386: __TI3?AUS@@[Flags.Volatile]: false
-COFF-I386: __TI3?AUS@@[CleanupFn]: ??1S@@UAE@XZ
-COFF-I386: __TI3?AUS@@[ForwardCompat]: null
-COFF-I386: __TI3?AUS@@[CatchableTypeArray]: __CTA3?AUS@@
-COFF-I386: __TI4CPAUS@@[Flags]: 1
-COFF-I386: __TI4CPAUS@@[Flags.Const]: true
-COFF-I386: __TI4CPAUS@@[Flags.Volatile]: false
-COFF-I386: __TI4CPAUS@@[CleanupFn]: null
-COFF-I386: __TI4CPAUS@@[ForwardCompat]: null
-COFF-I386: __TI4CPAUS@@[CatchableTypeArray]: __CTA4PAUS@@
-COFF-I386: __TI4CVPAUS@@[Flags]: 3
-COFF-I386: __TI4CVPAUS@@[Flags.Const]: true
-COFF-I386: __TI4CVPAUS@@[Flags.Volatile]: true
-COFF-I386: __TI4CVPAUS@@[CleanupFn]: null
-COFF-I386: __TI4CVPAUS@@[ForwardCompat]: null
-COFF-I386: __TI4CVPAUS@@[CatchableTypeArray]: __CTA4PAUS@@
-COFF-I386: __TI4PAUS@@[Flags]: 0
-COFF-I386: __TI4PAUS@@[Flags.Const]: false
-COFF-I386: __TI4PAUS@@[Flags.Volatile]: false
-COFF-I386: __TI4PAUS@@[CleanupFn]: null
-COFF-I386: __TI4PAUS@@[ForwardCompat]: null
-COFF-I386: __TI4PAUS@@[CatchableTypeArray]: __CTA4PAUS@@
-COFF-I386: __TI4VPAUS@@[Flags]: 2
-COFF-I386: __TI4VPAUS@@[Flags.Const]: false
-COFF-I386: __TI4VPAUS@@[Flags.Volatile]: true
-COFF-I386: __TI4VPAUS@@[CleanupFn]: null
-COFF-I386: __TI4VPAUS@@[ForwardCompat]: null
-COFF-I386: __TI4VPAUS@@[CatchableTypeArray]: __CTA4PAUS@@
-COFF-I386: __CTA1?AW4E@@[NumEntries]: 1
-COFF-I386: __CTA1?AW4E@@[0]: __CT??_R0?AW4E@@@84
-COFF-I386: __CTA1PQS@@H[NumEntries]: 1
-COFF-I386: __CTA1PQS@@H[0]: __CT??_R0PQS@@H@88
-COFF-I386: __CTA2PAW4E@@[NumEntries]: 2
-COFF-I386: __CTA2PAW4E@@[0]: __CT??_R0PAW4E@@@84
-COFF-I386: __CTA2PAW4E@@[1]: __CT??_R0PAX@84
-COFF-I386: __CTA2PAX[NumEntries]: 2
-COFF-I386: __CTA2PAX[0]: __CT??_R0PAX@84
-COFF-I386: __CTA2PAX[1]: __CT??_R0PAX@84
-COFF-I386: __CTA3?AUM@@[NumEntries]: 3
-COFF-I386: __CTA3?AUM@@[0]: __CT??_R0?AUM@@@88
-COFF-I386: __CTA3?AUM@@[1]: __CT??_R0?AUA@@@84
-COFF-I386: __CTA3?AUM@@[2]: __CT??_R0?AUB@@@844
-COFF-I386: __CTA3?AUS@@[NumEntries]: 3
-COFF-I386: __CTA3?AUS@@[0]: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16
-COFF-I386: __CTA3?AUS@@[1]: __CT??_R0?AUA@@@84044
-COFF-I386: __CTA3?AUS@@[2]: __CT??_R0?AUC@@@84048
-COFF-I386: __CTA4PAUS@@[NumEntries]: 4
-COFF-I386: __CTA4PAUS@@[0]: __CT??_R0PAUS@@@84
-COFF-I386: __CTA4PAUS@@[1]: __CT??_R0PAUA@@@84044
-COFF-I386: __CTA4PAUS@@[2]: __CT??_R0PAUC@@@84048
-COFF-I386: __CTA4PAUS@@[3]: __CT??_R0PAX@84
-COFF-I386: __CT??_R0?AUA@@@84[Flags]: 0
-COFF-I386: __CT??_R0?AUA@@@84[Flags.ScalarType]: false
-COFF-I386: __CT??_R0?AUA@@@84[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0?AUA@@@84[TypeDescriptor]: ??_R0?AUA@@@8
-COFF-I386: __CT??_R0?AUA@@@84[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUA@@@84[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0?AUA@@@84[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUA@@@84[Size]: 4
-COFF-I386: __CT??_R0?AUA@@@84[CopyCtor]: null
-COFF-I386: __CT??_R0?AUA@@@84044[Flags]: 0
-COFF-I386: __CT??_R0?AUA@@@84044[Flags.ScalarType]: false
-COFF-I386: __CT??_R0?AUA@@@84044[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0?AUA@@@84044[TypeDescriptor]: ??_R0?AUA@@@8
-COFF-I386: __CT??_R0?AUA@@@84044[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUA@@@84044[VirtualBasePointerOffset]: 4
-COFF-I386: __CT??_R0?AUA@@@84044[VirtualBaseAdjustmentOffset]: 4
-COFF-I386: __CT??_R0?AUA@@@84044[Size]: 4
-COFF-I386: __CT??_R0?AUA@@@84044[CopyCtor]: null
-COFF-I386: __CT??_R0?AUB@@@844[Flags]: 0
-COFF-I386: __CT??_R0?AUB@@@844[Flags.ScalarType]: false
-COFF-I386: __CT??_R0?AUB@@@844[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0?AUB@@@844[TypeDescriptor]: ??_R0?AUB@@@8
-COFF-I386: __CT??_R0?AUB@@@844[NonVirtualBaseAdjustmentOffset]: 4
-COFF-I386: __CT??_R0?AUB@@@844[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0?AUB@@@844[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUB@@@844[Size]: 4
-COFF-I386: __CT??_R0?AUB@@@844[CopyCtor]: null
-COFF-I386: __CT??_R0?AUC@@@84048[Flags]: 0
-COFF-I386: __CT??_R0?AUC@@@84048[Flags.ScalarType]: false
-COFF-I386: __CT??_R0?AUC@@@84048[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0?AUC@@@84048[TypeDescriptor]: ??_R0?AUC@@@8
-COFF-I386: __CT??_R0?AUC@@@84048[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUC@@@84048[VirtualBasePointerOffset]: 4
-COFF-I386: __CT??_R0?AUC@@@84048[VirtualBaseAdjustmentOffset]: 8
-COFF-I386: __CT??_R0?AUC@@@84048[Size]: 4
-COFF-I386: __CT??_R0?AUC@@@84048[CopyCtor]: null
-COFF-I386: __CT??_R0?AUM@@@88[Flags]: 0
-COFF-I386: __CT??_R0?AUM@@@88[Flags.ScalarType]: false
-COFF-I386: __CT??_R0?AUM@@@88[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0?AUM@@@88[TypeDescriptor]: ??_R0?AUM@@@8
-COFF-I386: __CT??_R0?AUM@@@88[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUM@@@88[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0?AUM@@@88[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUM@@@88[Size]: 8
-COFF-I386: __CT??_R0?AUM@@@88[CopyCtor]: null
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Flags]: 4
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Flags.ScalarType]: false
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Flags.VirtualInheritance]: true
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[TypeDescriptor]: ??_R0?AUS@@@8
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[Size]: 16
-COFF-I386: __CT??_R0?AUS@@@8??0S@@QAE@ABU0@@Z16[CopyCtor]: ??0S@@QAE@ABU0@@Z
-COFF-I386: __CT??_R0?AW4E@@@84[Flags]: 1
-COFF-I386: __CT??_R0?AW4E@@@84[Flags.ScalarType]: true
-COFF-I386: __CT??_R0?AW4E@@@84[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0?AW4E@@@84[TypeDescriptor]: ??_R0?AW4E@@@8
-COFF-I386: __CT??_R0?AW4E@@@84[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AW4E@@@84[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0?AW4E@@@84[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0?AW4E@@@84[Size]: 4
-COFF-I386: __CT??_R0?AW4E@@@84[CopyCtor]: null
-COFF-I386: __CT??_R0PAUA@@@84044[Flags]: 1
-COFF-I386: __CT??_R0PAUA@@@84044[Flags.ScalarType]: true
-COFF-I386: __CT??_R0PAUA@@@84044[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0PAUA@@@84044[TypeDescriptor]: ??_R0PAUA@@@8
-COFF-I386: __CT??_R0PAUA@@@84044[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAUA@@@84044[VirtualBasePointerOffset]: 4
-COFF-I386: __CT??_R0PAUA@@@84044[VirtualBaseAdjustmentOffset]: 4
-COFF-I386: __CT??_R0PAUA@@@84044[Size]: 4
-COFF-I386: __CT??_R0PAUA@@@84044[CopyCtor]: null
-COFF-I386: __CT??_R0PAUC@@@84048[Flags]: 1
-COFF-I386: __CT??_R0PAUC@@@84048[Flags.ScalarType]: true
-COFF-I386: __CT??_R0PAUC@@@84048[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0PAUC@@@84048[TypeDescriptor]: ??_R0PAUC@@@8
-COFF-I386: __CT??_R0PAUC@@@84048[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAUC@@@84048[VirtualBasePointerOffset]: 4
-COFF-I386: __CT??_R0PAUC@@@84048[VirtualBaseAdjustmentOffset]: 8
-COFF-I386: __CT??_R0PAUC@@@84048[Size]: 4
-COFF-I386: __CT??_R0PAUC@@@84048[CopyCtor]: null
-COFF-I386: __CT??_R0PAUS@@@84[Flags]: 5
-COFF-I386: __CT??_R0PAUS@@@84[Flags.ScalarType]: true
-COFF-I386: __CT??_R0PAUS@@@84[Flags.VirtualInheritance]: true
-COFF-I386: __CT??_R0PAUS@@@84[TypeDescriptor]: ??_R0PAUS@@@8
-COFF-I386: __CT??_R0PAUS@@@84[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAUS@@@84[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0PAUS@@@84[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAUS@@@84[Size]: 4
-COFF-I386: __CT??_R0PAUS@@@84[CopyCtor]: null
-COFF-I386: __CT??_R0PAW4E@@@84[Flags]: 1
-COFF-I386: __CT??_R0PAW4E@@@84[Flags.ScalarType]: true
-COFF-I386: __CT??_R0PAW4E@@@84[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0PAW4E@@@84[TypeDescriptor]: ??_R0PAW4E@@@8
-COFF-I386: __CT??_R0PAW4E@@@84[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAW4E@@@84[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0PAW4E@@@84[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAW4E@@@84[Size]: 4
-COFF-I386: __CT??_R0PAW4E@@@84[CopyCtor]: null
-COFF-I386: __CT??_R0PAX@84[Flags]: 1
-COFF-I386: __CT??_R0PAX@84[Flags.ScalarType]: true
-COFF-I386: __CT??_R0PAX@84[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0PAX@84[TypeDescriptor]: ??_R0PAX@8
-COFF-I386: __CT??_R0PAX@84[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAX@84[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0PAX@84[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PAX@84[Size]: 4
-COFF-I386: __CT??_R0PAX@84[CopyCtor]: null
-COFF-I386: __CT??_R0PQS@@H@88[Flags]: 1
-COFF-I386: __CT??_R0PQS@@H@88[Flags.ScalarType]: true
-COFF-I386: __CT??_R0PQS@@H@88[Flags.VirtualInheritance]: false
-COFF-I386: __CT??_R0PQS@@H@88[TypeDescriptor]: ??_R0PQS@@H@8
-COFF-I386: __CT??_R0PQS@@H@88[NonVirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PQS@@H@88[VirtualBasePointerOffset]: -1
-COFF-I386: __CT??_R0PQS@@H@88[VirtualBaseAdjustmentOffset]: 0
-COFF-I386: __CT??_R0PQS@@H@88[Size]: 8
-COFF-I386: __CT??_R0PQS@@H@88[CopyCtor]: null
diff --git a/test/tools/llvm-vtabledump/trivial.test b/test/tools/llvm-vtabledump/trivial.test
deleted file mode 100644
index 92bd058cfb1..00000000000
--- a/test/tools/llvm-vtabledump/trivial.test
+++ /dev/null
@@ -1,58 +0,0 @@
-RUN: llvm-vtabledump %p/Inputs/trivial.obj.coff-i386 \
-RUN:   | FileCheck %s --check-prefix=COFF-I386
-
-RUN: llvm-vtabledump %p/Inputs/trivial.obj.elf-i386 \
-RUN:   | FileCheck %s --check-prefix=ELF-I386
-
-COFF-I386:      ??_7S@@6B@[0]: ??_R4S@@6B@
-COFF-I386-NEXT: ??_7S@@6B@[4]: ??_GS@@UAEPAXI@Z
-COFF-I386-NEXT: ??_8S@@7B@[0]: -4
-COFF-I386-NEXT: ??_8S@@7B@[4]: 4
-COFF-I386-NEXT: ??_R4S@@6B@[IsImageRelative]: 0
-COFF-I386-NEXT: ??_R4S@@6B@[OffsetToTop]: 0
-COFF-I386-NEXT: ??_R4S@@6B@[VFPtrOffset]: 0
-COFF-I386-NEXT: ??_R4S@@6B@[TypeDescriptor]: ??_R0?AUS@@@8
-COFF-I386-NEXT: ??_R4S@@6B@[ClassHierarchyDescriptor]: ??_R3S@@8
-COFF-I386-NEXT: ??_R3A@@8[AlwaysZero]: 0
-COFF-I386-NEXT: ??_R3A@@8[Flags]: 0
-COFF-I386-NEXT: ??_R3A@@8[NumClasses]: 1
-COFF-I386-NEXT: ??_R3A@@8[BaseClassArray]: ??_R2A@@8
-COFF-I386-NEXT: ??_R3S@@8[AlwaysZero]: 0
-COFF-I386-NEXT: ??_R3S@@8[Flags]: 0
-COFF-I386-NEXT: ??_R3S@@8[NumClasses]: 2
-COFF-I386-NEXT: ??_R3S@@8[BaseClassArray]: ??_R2S@@8
-COFF-I386-NEXT: ??_R2A@@8[0]: ??_R1A@?0A@EA@A@@8
-COFF-I386-NEXT: ??_R2S@@8[0]: ??_R1A@?0A@EA@S@@8
-COFF-I386-NEXT: ??_R2S@@8[4]: ??_R1A@33FA@A@@8
-COFF-I386-NEXT: ??_R1A@33FA@A@@8[TypeDescriptor]: ??_R0?AUA@@@8
-COFF-I386-NEXT: ??_R1A@33FA@A@@8[NumBases]: 0
-COFF-I386-NEXT: ??_R1A@33FA@A@@8[OffsetInVBase]: 0
-COFF-I386-NEXT: ??_R1A@33FA@A@@8[VBPtrOffset]: 4
-COFF-I386-NEXT: ??_R1A@33FA@A@@8[OffsetInVBTable]: 4
-COFF-I386-NEXT: ??_R1A@33FA@A@@8[Flags]: 80
-COFF-I386-NEXT: ??_R1A@33FA@A@@8[ClassHierarchyDescriptor]: ??_R3A@@8
-COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[TypeDescriptor]: ??_R0?AUA@@@8
-COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[NumBases]: 0
-COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[OffsetInVBase]: 0
-COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[VBPtrOffset]: -1
-COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[OffsetInVBTable]: 0
-COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[Flags]: 64
-COFF-I386-NEXT: ??_R1A@?0A@EA@A@@8[ClassHierarchyDescriptor]: ??_R3A@@8
-COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[TypeDescriptor]: ??_R0?AUS@@@8
-COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[NumBases]: 1
-COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[OffsetInVBase]: 0
-COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[VBPtrOffset]: -1
-COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[OffsetInVBTable]: 0
-COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[Flags]: 64
-COFF-I386-NEXT: ??_R1A@?0A@EA@S@@8[ClassHierarchyDescriptor]: ??_R3S@@8
-COFF-I386-NEXT: ??_R0?AUA@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386-NEXT: ??_R0?AUA@@@8[AlwaysZero]: 0
-COFF-I386-NEXT: ??_R0?AUA@@@8[MangledName]: .?AUA@@
-COFF-I386-NEXT: ??_R0?AUS@@@8[VFPtr]: ??_7type_info@@6B@
-COFF-I386-NEXT: ??_R0?AUS@@@8[AlwaysZero]: 0
-COFF-I386-NEXT: ??_R0?AUS@@@8[MangledName]: .?AUS@@
-
-ELF-I386:      _ZTS1A: 1A
-ELF-I386-NEXT: _ZTV1A[0]: 0
-ELF-I386-NEXT: _ZTV1A[4]: _ZTI1A
-ELF-I386-NEXT: _ZTV1A[8]: _ZN1A1fEv
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 1f415b620df..7859b49c9de 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -37,7 +37,7 @@ add_llvm_tool_subdirectory(llvm-readobj)
 add_llvm_tool_subdirectory(llvm-rtdyld)
 add_llvm_tool_subdirectory(llvm-dwarfdump)
 add_llvm_tool_subdirectory(dsymutil)
-add_llvm_tool_subdirectory(llvm-vtabledump)
+add_llvm_tool_subdirectory(llvm-cxxdump)
 if( LLVM_USE_INTEL_JITEVENTS )
   add_llvm_tool_subdirectory(llvm-jitlistener)
 else()
diff --git a/tools/Makefile b/tools/Makefile
index fcb6c647e3a..d8534866c3d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -33,7 +33,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link \
                  macho-dump llvm-objdump llvm-readobj llvm-rtdyld \
                  llvm-dwarfdump llvm-cov llvm-size llvm-stress llvm-mcmarkup \
                  llvm-profdata llvm-symbolizer obj2yaml yaml2obj llvm-c-test \
-                 llvm-vtabledump verify-uselistorder dsymutil llvm-pdbdump
+                 llvm-cxxdump verify-uselistorder dsymutil llvm-pdbdump
 
 # If Intel JIT Events support is configured, build an extra tool to test it.
 ifeq ($(USE_INTEL_JITEVENTS), 1)
diff --git a/tools/llvm-cxxdump/CMakeLists.txt b/tools/llvm-cxxdump/CMakeLists.txt
new file mode 100644
index 00000000000..ada886e8887
--- /dev/null
+++ b/tools/llvm-cxxdump/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(LLVM_LINK_COMPONENTS
+  ${LLVM_TARGETS_TO_BUILD}
+  Object
+  Support
+  )
+
+add_llvm_tool(llvm-cxxdump
+  llvm-cxxdump.cpp
+  Error.cpp
+  )
diff --git a/tools/llvm-cxxdump/Error.cpp b/tools/llvm-cxxdump/Error.cpp
new file mode 100644
index 00000000000..16fed96e483
--- /dev/null
+++ b/tools/llvm-cxxdump/Error.cpp
@@ -0,0 +1,43 @@
+//===- Error.cxx - system_error extensions for llvm-cxxdump -----*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This defines a new error_category for the llvm-cxxdump tool.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Error.h"
+#include "llvm/Support/ErrorHandling.h"
+
+using namespace llvm;
+
+namespace {
+class cxxdump_error_category : public std::error_category {
+public:
+  const char *name() const LLVM_NOEXCEPT override { return "llvm.cxxdump"; }
+  std::string message(int ev) const override {
+    switch (static_cast<cxxdump_error>(ev)) {
+    case cxxdump_error::success:
+      return "Success";
+    case cxxdump_error::file_not_found:
+      return "No such file.";
+    case cxxdump_error::unrecognized_file_format:
+      return "Unrecognized file type.";
+    }
+    llvm_unreachable(
+        "An enumerator of cxxdump_error does not have a message defined.");
+  }
+};
+} // namespace
+
+namespace llvm {
+const std::error_category &cxxdump_category() {
+  static cxxdump_error_category o;
+  return o;
+}
+} // namespace llvm
diff --git a/tools/llvm-cxxdump/Error.h b/tools/llvm-cxxdump/Error.h
new file mode 100644
index 00000000000..7caf6d6447c
--- /dev/null
+++ b/tools/llvm-cxxdump/Error.h
@@ -0,0 +1,39 @@
+//===- Error.h - system_error extensions for llvm-cxxdump -------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This declares a new error_category for the llvm-cxxdump tool.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TOOLS_LLVM_CXXDUMP_ERROR_H
+#define LLVM_TOOLS_LLVM_CXXDUMP_ERROR_H
+
+#include <system_error>
+
+namespace llvm {
+const std::error_category &cxxdump_category();
+
+enum class cxxdump_error {
+  success = 0,
+  file_not_found,
+  unrecognized_file_format,
+};
+
+inline std::error_code make_error_code(cxxdump_error e) {
+  return std::error_code(static_cast<int>(e), cxxdump_category());
+}
+
+} // namespace llvm
+
+namespace std {
+template <>
+struct is_error_code_enum<llvm::cxxdump_error> : std::true_type {};
+}
+
+#endif
diff --git a/tools/llvm-cxxdump/LLVMBuild.txt b/tools/llvm-cxxdump/LLVMBuild.txt
new file mode 100644
index 00000000000..4e088157799
--- /dev/null
+++ b/tools/llvm-cxxdump/LLVMBuild.txt
@@ -0,0 +1,22 @@
+;===- ./tools/llvm-cxxdump/LLVMBuild.txt -----------------------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Tool
+name = llvm-cxxdump
+parent = Tools
+required_libraries = all-targets BitReader Object
diff --git a/tools/llvm-cxxdump/Makefile b/tools/llvm-cxxdump/Makefile
new file mode 100644
index 00000000000..02e8e5f9010
--- /dev/null
+++ b/tools/llvm-cxxdump/Makefile
@@ -0,0 +1,18 @@
+##===- tools/llvm-cxxdump/Makefile -------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LEVEL := ../..
+TOOLNAME := llvm-cxxdump
+LINK_COMPONENTS := bitreader object all-targets
+
+# This tool has no plugins, optimize startup time.
+TOOL_NO_EXPORTS := 1
+
+include $(LEVEL)/Makefile.common
+
diff --git a/tools/llvm-cxxdump/llvm-cxxdump.cpp b/tools/llvm-cxxdump/llvm-cxxdump.cpp
new file mode 100644
index 00000000000..e76f66c3980
--- /dev/null
+++ b/tools/llvm-cxxdump/llvm-cxxdump.cpp
@@ -0,0 +1,570 @@
+//===- llvm-cxxdump.cpp - Dump C++ data in an Object File -------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Dumps C++ data resident in object files and archives.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm-cxxdump.h"
+#include "Error.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/Object/Archive.h"
+#include "llvm/Object/ObjectFile.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/Endian.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/Signals.h"
+#include "llvm/Support/TargetRegistry.h"
+#include "llvm/Support/TargetSelect.h"
+#include <map>
+#include <string>
+#include <system_error>
+
+using namespace llvm;
+using namespace llvm::object;
+using namespace llvm::support;
+
+namespace opts {
+cl::list<std::string> InputFilenames(cl::Positional,
+                                     cl::desc("<input object files>"),
+                                     cl::ZeroOrMore);
+} // namespace opts
+
+static int ReturnValue = EXIT_SUCCESS;
+
+namespace llvm {
+
+static bool error(std::error_code EC) {
+  if (!EC)
+    return false;
+
+  ReturnValue = EXIT_FAILURE;
+  outs() << "\nError reading file: " << EC.message() << ".\n";
+  outs().flush();
+  return true;
+}
+
+} // namespace llvm
+
+static void reportError(StringRef Input, StringRef Message) {
+  if (Input == "-")
+    Input = "<stdin>";
+
+  errs() << Input << ": " << Message << "\n";
+  errs().flush();
+  ReturnValue = EXIT_FAILURE;
+}
+
+static void reportError(StringRef Input, std::error_code EC) {
+  reportError(Input, EC.message());
+}
+
+static SmallVectorImpl<SectionRef> &getRelocSections(const ObjectFile *Obj,
+                                                     const SectionRef &Sec) {
+  static bool MappingDone = false;
+  static std::map<SectionRef, SmallVector<SectionRef, 1>> SectionRelocMap;
+  if (!MappingDone) {
+    for (const SectionRef &Section : Obj->sections()) {
+      section_iterator Sec2 = Section.getRelocatedSection();
+      if (Sec2 != Obj->section_end())
+        SectionRelocMap[*Sec2].push_back(Section);
+    }
+    MappingDone = true;
+  }
+  return SectionRelocMap[Sec];
+}
+
+static bool collectRelocatedSymbols(const ObjectFile *Obj,
+                                    const SectionRef &Sec, uint64_t SecAddress,
+                                    uint64_t SymAddress, uint64_t SymSize,
+                                    StringRef *I, StringRef *E) {
+  uint64_t SymOffset = SymAddress - SecAddress;
+  uint64_t SymEnd = SymOffset + SymSize;
+  for (const SectionRef &SR : getRelocSections(Obj, Sec)) {
+    for (const object::RelocationRef &Reloc : SR.relocations()) {
+      if (I == E)
+        break;
+      const object::symbol_iterator RelocSymI = Reloc.getSymbol();
+      if (RelocSymI == Obj->symbol_end())
+        continue;
+      StringRef RelocSymName;
+      if (error(RelocSymI->getName(RelocSymName)))
+        return true;
+      uint64_t Offset;
+      if (error(Reloc.getOffset(Offset)))
+        return true;
+      if (Offset >= SymOffset && Offset < SymEnd) {
+        *I = RelocSymName;
+        ++I;
+      }
+    }
+  }
+  return false;
+}
+
+static bool collectRelocationOffsets(
+    const ObjectFile *Obj, const SectionRef &Sec, uint64_t SecAddress,
+    uint64_t SymAddress, uint64_t SymSize, StringRef SymName,
+    std::map<std::pair<StringRef, uint64_t>, StringRef> &Collection) {
+  uint64_t SymOffset = SymAddress - SecAddress;
+  uint64_t SymEnd = SymOffset + SymSize;
+  for (const SectionRef &SR : getRelocSections(Obj, Sec)) {
+    for (const object::RelocationRef &Reloc : SR.relocations()) {
+      const object::symbol_iterator RelocSymI = Reloc.getSymbol();
+      if (RelocSymI == Obj->symbol_end())
+        continue;
+      StringRef RelocSymName;
+      if (error(RelocSymI->getName(RelocSymName)))
+        return true;
+      uint64_t Offset;
+      if (error(Reloc.getOffset(Offset)))
+        return true;
+      if (Offset >= SymOffset && Offset < SymEnd)
+        Collection[std::make_pair(SymName, Offset - SymOffset)] = RelocSymName;
+    }
+  }
+  return false;
+}
+
+static void dumpCXXData(const ObjectFile *Obj) {
+  struct CompleteObjectLocator {
+    StringRef Symbols[2];
+    ArrayRef<little32_t> Data;
+  };
+  struct ClassHierarchyDescriptor {
+    StringRef Symbols[1];
+    ArrayRef<little32_t> Data;
+  };
+  struct BaseClassDescriptor {
+    StringRef Symbols[2];
+    ArrayRef<little32_t> Data;
+  };
+  struct TypeDescriptor {
+    StringRef Symbols[1];
+    uint64_t AlwaysZero;
+    StringRef MangledName;
+  };
+  struct ThrowInfo {
+    uint32_t Flags;
+  };
+  struct CatchableTypeArray {
+    uint32_t NumEntries;
+  };
+  struct CatchableType {
+    uint32_t Flags;
+    uint32_t NonVirtualBaseAdjustmentOffset;
+    int32_t VirtualBasePointerOffset;
+    uint32_t VirtualBaseAdjustmentOffset;
+    uint32_t Size;
+    StringRef Symbols[2];
+  };
+  std::map<std::pair<StringRef, uint64_t>, StringRef> VFTableEntries;
+  std::map<std::pair<StringRef, uint64_t>, StringRef> TIEntries;
+  std::map<std::pair<StringRef, uint64_t>, StringRef> CTAEntries;
+  std::map<StringRef, ArrayRef<little32_t>> VBTables;
+  std::map<StringRef, CompleteObjectLocator> COLs;
+  std::map<StringRef, ClassHierarchyDescriptor> CHDs;
+  std::map<std::pair<StringRef, uint64_t>, StringRef> BCAEntries;
+  std::map<StringRef, BaseClassDescriptor> BCDs;
+  std::map<StringRef, TypeDescriptor> TDs;
+  std::map<StringRef, ThrowInfo> TIs;
+  std::map<StringRef, CatchableTypeArray> CTAs;
+  std::map<StringRef, CatchableType> CTs;
+
+  std::map<std::pair<StringRef, uint64_t>, StringRef> VTableSymEntries;
+  std::map<std::pair<StringRef, uint64_t>, int64_t> VTableDataEntries;
+  std::map<std::pair<StringRef, uint64_t>, StringRef> VTTEntries;
+  std::map<StringRef, StringRef> TINames;
+
+  uint8_t BytesInAddress = Obj->getBytesInAddress();
+
+  for (const object::SymbolRef &Sym : Obj->symbols()) {
+    StringRef SymName;
+    if (error(Sym.getName(SymName)))
+      return;
+    object::section_iterator SecI(Obj->section_begin());
+    if (error(Sym.getSection(SecI)))
+      return;
+    // Skip external symbols.
+    if (SecI == Obj->section_end())
+      continue;
+    const SectionRef &Sec = *SecI;
+    // Skip virtual or BSS sections.
+    if (Sec.isBSS() || Sec.isVirtual())
+      continue;
+    StringRef SecContents;
+    if (error(Sec.getContents(SecContents)))
+      return;
+    uint64_t SymAddress, SymSize;
+    if (error(Sym.getAddress(SymAddress)) || error(Sym.getSize(SymSize)))
+      return;
+    uint64_t SecAddress = Sec.getAddress();
+    uint64_t SecSize = Sec.getSize();
+    uint64_t SymOffset = SymAddress - SecAddress;
+    StringRef SymContents = SecContents.substr(SymOffset, SymSize);
+
+    // VFTables in the MS-ABI start with '??_7' and are contained within their
+    // own COMDAT section.  We then determine the contents of the VFTable by
+    // looking at each relocation in the section.
+    if (SymName.startswith("??_7")) {
+      // Each relocation either names a virtual method or a thunk.  We note the
+      // offset into the section and the symbol used for the relocation.
+      collectRelocationOffsets(Obj, Sec, SecAddress, SecAddress, SecSize,
+                               SymName, VFTableEntries);
+    }
+    // VBTables in the MS-ABI start with '??_8' and are filled with 32-bit
+    // offsets of virtual bases.
+    else if (SymName.startswith("??_8")) {
+      ArrayRef<little32_t> VBTableData(
+          reinterpret_cast<const little32_t *>(SymContents.data()),
+          SymContents.size() / sizeof(little32_t));
+      VBTables[SymName] = VBTableData;
+    }
+    // Complete object locators in the MS-ABI start with '??_R4'
+    else if (SymName.startswith("??_R4")) {
+      CompleteObjectLocator COL;
+      COL.Data = ArrayRef<little32_t>(
+          reinterpret_cast<const little32_t *>(SymContents.data()), 3);
+      StringRef *I = std::begin(COL.Symbols), *E = std::end(COL.Symbols);
+      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
+                                  E))
+        return;
+      COLs[SymName] = COL;
+    }
+    // Class hierarchy descriptors in the MS-ABI start with '??_R3'
+    else if (SymName.startswith("??_R3")) {
+      ClassHierarchyDescriptor CHD;
+      CHD.Data = ArrayRef<little32_t>(
+          reinterpret_cast<const little32_t *>(SymContents.data()), 3);
+      StringRef *I = std::begin(CHD.Symbols), *E = std::end(CHD.Symbols);
+      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
+                                  E))
+        return;
+      CHDs[SymName] = CHD;
+    }
+    // Class hierarchy descriptors in the MS-ABI start with '??_R2'
+    else if (SymName.startswith("??_R2")) {
+      // Each relocation names a base class descriptor.  We note the offset into
+      // the section and the symbol used for the relocation.
+      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
+                               SymName, BCAEntries);
+    }
+    // Base class descriptors in the MS-ABI start with '??_R1'
+    else if (SymName.startswith("??_R1")) {
+      BaseClassDescriptor BCD;
+      BCD.Data = ArrayRef<little32_t>(
+          reinterpret_cast<const little32_t *>(SymContents.data()) + 1, 5);
+      StringRef *I = std::begin(BCD.Symbols), *E = std::end(BCD.Symbols);
+      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
+                                  E))
+        return;
+      BCDs[SymName] = BCD;
+    }
+    // Type descriptors in the MS-ABI start with '??_R0'
+    else if (SymName.startswith("??_R0")) {
+      const char *DataPtr = SymContents.drop_front(BytesInAddress).data();
+      TypeDescriptor TD;
+      if (BytesInAddress == 8)
+        TD.AlwaysZero = *reinterpret_cast<const little64_t *>(DataPtr);
+      else
+        TD.AlwaysZero = *reinterpret_cast<const little32_t *>(DataPtr);
+      TD.MangledName = SymContents.drop_front(BytesInAddress * 2);
+      StringRef *I = std::begin(TD.Symbols), *E = std::end(TD.Symbols);
+      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
+                                  E))
+        return;
+      TDs[SymName] = TD;
+    }
+    // Throw descriptors in the MS-ABI start with '_TI'
+    else if (SymName.startswith("_TI") || SymName.startswith("__TI")) {
+      ThrowInfo TI;
+      TI.Flags = *reinterpret_cast<const little32_t *>(SymContents.data());
+      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
+                               SymName, TIEntries);
+      TIs[SymName] = TI;
+    }
+    // Catchable type arrays in the MS-ABI start with _CTA or __CTA.
+    else if (SymName.startswith("_CTA") || SymName.startswith("__CTA")) {
+      CatchableTypeArray CTA;
+      CTA.NumEntries =
+          *reinterpret_cast<const little32_t *>(SymContents.data());
+      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
+                               SymName, CTAEntries);
+      CTAs[SymName] = CTA;
+    }
+    // Catchable types in the MS-ABI start with _CT or __CT.
+    else if (SymName.startswith("_CT") || SymName.startswith("__CT")) {
+      const little32_t *DataPtr =
+          reinterpret_cast<const little32_t *>(SymContents.data());
+      CatchableType CT;
+      CT.Flags = DataPtr[0];
+      CT.NonVirtualBaseAdjustmentOffset = DataPtr[2];
+      CT.VirtualBasePointerOffset = DataPtr[3];
+      CT.VirtualBaseAdjustmentOffset = DataPtr[4];
+      CT.Size = DataPtr[5];
+      StringRef *I = std::begin(CT.Symbols), *E = std::end(CT.Symbols);
+      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
+                                  E))
+        return;
+      CTs[SymName] = CT;
+    }
+    // Construction vtables in the Itanium ABI start with '_ZTT' or '__ZTT'.
+    else if (SymName.startswith("_ZTT") || SymName.startswith("__ZTT")) {
+      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
+                               SymName, VTTEntries);
+    }
+    // Typeinfo names in the Itanium ABI start with '_ZTS' or '__ZTS'.
+    else if (SymName.startswith("_ZTS") || SymName.startswith("__ZTS")) {
+      TINames[SymName] = SymContents.slice(0, SymContents.find('\0'));
+    }
+    // Vtables in the Itanium ABI start with '_ZTV' or '__ZTV'.
+    else if (SymName.startswith("_ZTV") || SymName.startswith("__ZTV")) {
+      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
+                               SymName, VTableSymEntries);
+      for (uint64_t SymOffI = 0; SymOffI < SymSize; SymOffI += BytesInAddress) {
+        auto Key = std::make_pair(SymName, SymOffI);
+        if (VTableSymEntries.count(Key))
+          continue;
+        const char *DataPtr =
+            SymContents.substr(SymOffI, BytesInAddress).data();
+        int64_t VData;
+        if (BytesInAddress == 8)
+          VData = *reinterpret_cast<const little64_t *>(DataPtr);
+        else
+          VData = *reinterpret_cast<const little32_t *>(DataPtr);
+        VTableDataEntries[Key] = VData;
+      }
+    }
+    // Typeinfo structures in the Itanium ABI start with '_ZTI' or '__ZTI'.
+    else if (SymName.startswith("_ZTI") || SymName.startswith("__ZTI")) {
+      // FIXME: Do something with these!
+    }
+  }
+  for (const auto &VFTableEntry : VFTableEntries) {
+    StringRef VFTableName = VFTableEntry.first.first;
+    uint64_t Offset = VFTableEntry.first.second;
+    StringRef SymName = VFTableEntry.second;
+    outs() << VFTableName << '[' << Offset << "]: " << SymName << '\n';
+  }
+  for (const std::pair<StringRef, ArrayRef<little32_t>> &VBTable : VBTables) {
+    StringRef VBTableName = VBTable.first;
+    uint32_t Idx = 0;
+    for (little32_t Offset : VBTable.second) {
+      outs() << VBTableName << '[' << Idx << "]: " << Offset << '\n';
+      Idx += sizeof(Offset);
+    }
+  }
+  for (const std::pair<StringRef, CompleteObjectLocator> &COLPair : COLs) {
+    StringRef COLName = COLPair.first;
+    const CompleteObjectLocator &COL = COLPair.second;
+    outs() << COLName << "[IsImageRelative]: " << COL.Data[0] << '\n';
+    outs() << COLName << "[OffsetToTop]: " << COL.Data[1] << '\n';
+    outs() << COLName << "[VFPtrOffset]: " << COL.Data[2] << '\n';
+    outs() << COLName << "[TypeDescriptor]: " << COL.Symbols[0] << '\n';
+    outs() << COLName << "[ClassHierarchyDescriptor]: " << COL.Symbols[1]
+           << '\n';
+  }
+  for (const std::pair<StringRef, ClassHierarchyDescriptor> &CHDPair : CHDs) {
+    StringRef CHDName = CHDPair.first;
+    const ClassHierarchyDescriptor &CHD = CHDPair.second;
+    outs() << CHDName << "[AlwaysZero]: " << CHD.Data[0] << '\n';
+    outs() << CHDName << "[Flags]: " << CHD.Data[1] << '\n';
+    outs() << CHDName << "[NumClasses]: " << CHD.Data[2] << '\n';
+    outs() << CHDName << "[BaseClassArray]: " << CHD.Symbols[0] << '\n';
+  }
+  for (const std::pair<std::pair<StringRef, uint64_t>, StringRef> &BCAEntry :
+       BCAEntries) {
+    StringRef BCAName = BCAEntry.first.first;
+    uint64_t Offset = BCAEntry.first.second;
+    StringRef SymName = BCAEntry.second;
+    outs() << BCAName << '[' << Offset << "]: " << SymName << '\n';
+  }
+  for (const std::pair<StringRef, BaseClassDescriptor> &BCDPair : BCDs) {
+    StringRef BCDName = BCDPair.first;
+    const BaseClassDescriptor &BCD = BCDPair.second;
+    outs() << BCDName << "[TypeDescriptor]: " << BCD.Symbols[0] << '\n';
+    outs() << BCDName << "[NumBases]: " << BCD.Data[0] << '\n';
+    outs() << BCDName << "[OffsetInVBase]: " << BCD.Data[1] << '\n';
+    outs() << BCDName << "[VBPtrOffset]: " << BCD.Data[2] << '\n';
+    outs() << BCDName << "[OffsetInVBTable]: " << BCD.Data[3] << '\n';
+    outs() << BCDName << "[Flags]: " << BCD.Data[4] << '\n';
+    outs() << BCDName << "[ClassHierarchyDescriptor]: " << BCD.Symbols[1]
+           << '\n';
+  }
+  for (const std::pair<StringRef, TypeDescriptor> &TDPair : TDs) {
+    StringRef TDName = TDPair.first;
+    const TypeDescriptor &TD = TDPair.second;
+    outs() << TDName << "[VFPtr]: " << TD.Symbols[0] << '\n';
+    outs() << TDName << "[AlwaysZero]: " << TD.AlwaysZero << '\n';
+    outs() << TDName << "[MangledName]: ";
+    outs().write_escaped(TD.MangledName.rtrim(StringRef("\0", 1)),
+                         /*UseHexEscapes=*/true)
+        << '\n';
+  }
+  for (const std::pair<StringRef, ThrowInfo> &TIPair : TIs) {
+    StringRef TIName = TIPair.first;
+    const ThrowInfo &TI = TIPair.second;
+    auto dumpThrowInfoFlag = [&](const char *Name, uint32_t Flag) {
+      outs() << TIName << "[Flags." << Name
+             << "]: " << (TI.Flags & Flag ? "true" : "false") << '\n';
+    };
+    auto dumpThrowInfoSymbol = [&](const char *Name, int Offset) {
+      outs() << TIName << '[' << Name << "]: ";
+      auto Entry = TIEntries.find(std::make_pair(TIName, Offset));
+      outs() << (Entry == TIEntries.end() ? "null" : Entry->second) << '\n';
+    };
+    outs() << TIName << "[Flags]: " << TI.Flags << '\n';
+    dumpThrowInfoFlag("Const", 1);
+    dumpThrowInfoFlag("Volatile", 2);
+    dumpThrowInfoSymbol("CleanupFn", 4);
+    dumpThrowInfoSymbol("ForwardCompat", 8);
+    dumpThrowInfoSymbol("CatchableTypeArray", 12);
+  }
+  for (const std::pair<StringRef, CatchableTypeArray> &CTAPair : CTAs) {
+    StringRef CTAName = CTAPair.first;
+    const CatchableTypeArray &CTA = CTAPair.second;
+
+    outs() << CTAName << "[NumEntries]: " << CTA.NumEntries << '\n';
+
+    unsigned Idx = 0;
+    for (auto I = CTAEntries.lower_bound(std::make_pair(CTAName, 0)),
+              E = CTAEntries.upper_bound(std::make_pair(CTAName, UINT64_MAX));
+         I != E; ++I)
+      outs() << CTAName << '[' << Idx++ << "]: " << I->second << '\n';
+  }
+  for (const std::pair<StringRef, CatchableType> &CTPair : CTs) {
+    StringRef CTName = CTPair.first;
+    const CatchableType &CT = CTPair.second;
+    auto dumpCatchableTypeFlag = [&](const char *Name, uint32_t Flag) {
+      outs() << CTName << "[Flags." << Name
+             << "]: " << (CT.Flags & Flag ? "true" : "false") << '\n';
+    };
+    outs() << CTName << "[Flags]: " << CT.Flags << '\n';
+    dumpCatchableTypeFlag("ScalarType", 1);
+    dumpCatchableTypeFlag("VirtualInheritance", 4);
+    outs() << CTName << "[TypeDescriptor]: " << CT.Symbols[0] << '\n';
+    outs() << CTName << "[NonVirtualBaseAdjustmentOffset]: "
+           << CT.NonVirtualBaseAdjustmentOffset << '\n';
+    outs() << CTName
+           << "[VirtualBasePointerOffset]: " << CT.VirtualBasePointerOffset
+           << '\n';
+    outs() << CTName << "[VirtualBaseAdjustmentOffset]: "
+           << CT.VirtualBaseAdjustmentOffset << '\n';
+    outs() << CTName << "[Size]: " << CT.Size << '\n';
+    outs() << CTName
+           << "[CopyCtor]: " << (CT.Symbols[1].empty() ? "null" : CT.Symbols[1])
+           << '\n';
+  }
+  for (const std::pair<std::pair<StringRef, uint64_t>, StringRef> &VTTPair :
+       VTTEntries) {
+    StringRef VTTName = VTTPair.first.first;
+    uint64_t VTTOffset = VTTPair.first.second;
+    StringRef VTTEntry = VTTPair.second;
+    outs() << VTTName << '[' << VTTOffset << "]: " << VTTEntry << '\n';
+  }
+  for (const std::pair<StringRef, StringRef> &TIPair : TINames) {
+    StringRef TIName = TIPair.first;
+    outs() << TIName << ": " << TIPair.second << '\n';
+  }
+  auto VTableSymI = VTableSymEntries.begin();
+  auto VTableSymE = VTableSymEntries.end();
+  auto VTableDataI = VTableDataEntries.begin();
+  auto VTableDataE = VTableDataEntries.end();
+  for (;;) {
+    bool SymDone = VTableSymI == VTableSymE;
+    bool DataDone = VTableDataI == VTableDataE;
+    if (SymDone && DataDone)
+      break;
+    if (!SymDone && (DataDone || VTableSymI->first < VTableDataI->first)) {
+      StringRef VTableName = VTableSymI->first.first;
+      uint64_t Offset = VTableSymI->first.second;
+      StringRef VTableEntry = VTableSymI->second;
+      outs() << VTableName << '[' << Offset << "]: ";
+      outs() << VTableEntry;
+      outs() << '\n';
+      ++VTableSymI;
+      continue;
+    }
+    if (!DataDone && (SymDone || VTableDataI->first < VTableSymI->first)) {
+      StringRef VTableName = VTableDataI->first.first;
+      uint64_t Offset = VTableDataI->first.second;
+      int64_t VTableEntry = VTableDataI->second;
+      outs() << VTableName << '[' << Offset << "]: ";
+      outs() << VTableEntry;
+      outs() << '\n';
+      ++VTableDataI;
+      continue;
+    }
+  }
+}
+
+static void dumpArchive(const Archive *Arc) {
+  for (const Archive::Child &ArcC : Arc->children()) {
+    ErrorOr<std::unique_ptr<Binary>> ChildOrErr = ArcC.getAsBinary();
+    if (std::error_code EC = ChildOrErr.getError()) {
+      // Ignore non-object files.
+      if (EC != object_error::invalid_file_type)
+        reportError(Arc->getFileName(), EC.message());
+      continue;
+    }
+
+    if (ObjectFile *Obj = dyn_cast<ObjectFile>(&*ChildOrErr.get()))
+      dumpCXXData(Obj);
+    else
+      reportError(Arc->getFileName(), cxxdump_error::unrecognized_file_format);
+  }
+}
+
+static void dumpInput(StringRef File) {
+  // If file isn't stdin, check that it exists.
+  if (File != "-" && !sys::fs::exists(File)) {
+    reportError(File, cxxdump_error::file_not_found);
+    return;
+  }
+
+  // Attempt to open the binary.
+  ErrorOr<OwningBinary<Binary>> BinaryOrErr = createBinary(File);
+  if (std::error_code EC = BinaryOrErr.getError()) {
+    reportError(File, EC);
+    return;
+  }
+  Binary &Binary = *BinaryOrErr.get().getBinary();
+
+  if (Archive *Arc = dyn_cast<Archive>(&Binary))
+    dumpArchive(Arc);
+  else if (ObjectFile *Obj = dyn_cast<ObjectFile>(&Binary))
+    dumpCXXData(Obj);
+  else
+    reportError(File, cxxdump_error::unrecognized_file_format);
+}
+
+int main(int argc, const char *argv[]) {
+  sys::PrintStackTraceOnErrorSignal();
+  PrettyStackTraceProgram X(argc, argv);
+  llvm_shutdown_obj Y;
+
+  // Initialize targets.
+  llvm::InitializeAllTargetInfos();
+
+  // Register the target printer for --version.
+  cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
+
+  cl::ParseCommandLineOptions(argc, argv, "LLVM C++ ABI Data Dumper\n");
+
+  // Default to stdin if no filename is specified.
+  if (opts::InputFilenames.size() == 0)
+    opts::InputFilenames.push_back("-");
+
+  std::for_each(opts::InputFilenames.begin(), opts::InputFilenames.end(),
+                dumpInput);
+
+  return ReturnValue;
+}
diff --git a/tools/llvm-cxxdump/llvm-cxxdump.h b/tools/llvm-cxxdump/llvm-cxxdump.h
new file mode 100644
index 00000000000..daa05cb2ca0
--- /dev/null
+++ b/tools/llvm-cxxdump/llvm-cxxdump.h
@@ -0,0 +1,23 @@
+//===-- llvm-cxxdump.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TOOLS_LLVM_CXXDUMP_LLVM_CXXDUMP_H
+#define LLVM_TOOLS_LLVM_CXXDUMP_LLVM_CXXDUMP_H
+
+#include "llvm/Support/CommandLine.h"
+#include <string>
+
+namespace opts {
+extern llvm::cl::list<std::string> InputFilenames;
+} // namespace opts
+
+#define LLVM_CXXDUMP_ENUM_ENT(ns, enum)                                        \
+  { #enum, ns::enum }
+
+#endif
diff --git a/tools/llvm-vtabledump/CMakeLists.txt b/tools/llvm-vtabledump/CMakeLists.txt
deleted file mode 100644
index 4fe205b6efd..00000000000
--- a/tools/llvm-vtabledump/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Object
-  Support
-  )
-
-add_llvm_tool(llvm-vtabledump
-  llvm-vtabledump.cpp
-  Error.cpp
-  )
diff --git a/tools/llvm-vtabledump/Error.cpp b/tools/llvm-vtabledump/Error.cpp
deleted file mode 100644
index c5de8951636..00000000000
--- a/tools/llvm-vtabledump/Error.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//===- Error.cpp - system_error extensions for llvm-vtabledump --*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This defines a new error_category for the llvm-vtabledump tool.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Error.h"
-#include "llvm/Support/ErrorHandling.h"
-
-using namespace llvm;
-
-namespace {
-class vtabledump_error_category : public std::error_category {
-public:
-  const char *name() const LLVM_NOEXCEPT override { return "llvm.vtabledump"; }
-  std::string message(int ev) const override {
-    switch (static_cast<vtabledump_error>(ev)) {
-    case vtabledump_error::success:
-      return "Success";
-    case vtabledump_error::file_not_found:
-      return "No such file.";
-    case vtabledump_error::unrecognized_file_format:
-      return "Unrecognized file type.";
-    }
-    llvm_unreachable(
-        "An enumerator of vtabledump_error does not have a message defined.");
-  }
-};
-} // namespace
-
-namespace llvm {
-const std::error_category &vtabledump_category() {
-  static vtabledump_error_category o;
-  return o;
-}
-} // namespace llvm
diff --git a/tools/llvm-vtabledump/Error.h b/tools/llvm-vtabledump/Error.h
deleted file mode 100644
index fd8bb18994d..00000000000
--- a/tools/llvm-vtabledump/Error.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//===- Error.h - system_error extensions for llvm-vtabledump ----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This declares a new error_category for the llvm-vtabledump tool.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_VTABLEDUMP_ERROR_H
-#define LLVM_TOOLS_LLVM_VTABLEDUMP_ERROR_H
-
-#include <system_error>
-
-namespace llvm {
-const std::error_category &vtabledump_category();
-
-enum class vtabledump_error {
-  success = 0,
-  file_not_found,
-  unrecognized_file_format,
-};
-
-inline std::error_code make_error_code(vtabledump_error e) {
-  return std::error_code(static_cast<int>(e), vtabledump_category());
-}
-
-} // namespace llvm
-
-namespace std {
-template <>
-struct is_error_code_enum<llvm::vtabledump_error> : std::true_type {};
-}
-
-#endif
diff --git a/tools/llvm-vtabledump/LLVMBuild.txt b/tools/llvm-vtabledump/LLVMBuild.txt
deleted file mode 100644
index 6a3cbfff4c1..00000000000
--- a/tools/llvm-vtabledump/LLVMBuild.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-;===- ./tools/llvm-vtabledump/LLVMBuild.txt --------------------*- Conf -*--===;
-;
-;                     The LLVM Compiler Infrastructure
-;
-; This file is distributed under the University of Illinois Open Source
-; License. See LICENSE.TXT for details.
-;
-;===------------------------------------------------------------------------===;
-;
-; This is an LLVMBuild description file for the components in this subdirectory.
-;
-; For more information on the LLVMBuild system, please see:
-;
-;   http://llvm.org/docs/LLVMBuild.html
-;
-;===------------------------------------------------------------------------===;
-
-[component_0]
-type = Tool
-name = llvm-vtabledump
-parent = Tools
-required_libraries = all-targets BitReader Object
diff --git a/tools/llvm-vtabledump/Makefile b/tools/llvm-vtabledump/Makefile
deleted file mode 100644
index 596c64c67b6..00000000000
--- a/tools/llvm-vtabledump/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-##===- tools/llvm-vtabledump/Makefile ----------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL := ../..
-TOOLNAME := llvm-vtabledump
-LINK_COMPONENTS := bitreader object all-targets
-
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS := 1
-
-include $(LEVEL)/Makefile.common
-
diff --git a/tools/llvm-vtabledump/llvm-vtabledump.cpp b/tools/llvm-vtabledump/llvm-vtabledump.cpp
deleted file mode 100644
index de3f5a94378..00000000000
--- a/tools/llvm-vtabledump/llvm-vtabledump.cpp
+++ /dev/null
@@ -1,569 +0,0 @@
-//===- llvm-vtabledump.cpp - Dump vtables in an Object File -----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Dumps VTables resident in object files and archives.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-vtabledump.h"
-#include "Error.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Object/Archive.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include <map>
-#include <string>
-#include <system_error>
-
-using namespace llvm;
-using namespace llvm::object;
-using namespace llvm::support;
-
-namespace opts {
-cl::list<std::string> InputFilenames(cl::Positional,
-                                     cl::desc("<input object files>"),
-                                     cl::ZeroOrMore);
-} // namespace opts
-
-static int ReturnValue = EXIT_SUCCESS;
-
-namespace llvm {
-
-static bool error(std::error_code EC) {
-  if (!EC)
-    return false;
-
-  ReturnValue = EXIT_FAILURE;
-  outs() << "\nError reading file: " << EC.message() << ".\n";
-  outs().flush();
-  return true;
-}
-
-} // namespace llvm
-
-static void reportError(StringRef Input, StringRef Message) {
-  if (Input == "-")
-    Input = "<stdin>";
-
-  errs() << Input << ": " << Message << "\n";
-  errs().flush();
-  ReturnValue = EXIT_FAILURE;
-}
-
-static void reportError(StringRef Input, std::error_code EC) {
-  reportError(Input, EC.message());
-}
-
-static SmallVectorImpl<SectionRef> &getRelocSections(const ObjectFile *Obj,
-                                                     const SectionRef &Sec) {
-  static bool MappingDone = false;
-  static std::map<SectionRef, SmallVector<SectionRef, 1>> SectionRelocMap;
-  if (!MappingDone) {
-    for (const SectionRef &Section : Obj->sections()) {
-      section_iterator Sec2 = Section.getRelocatedSection();
-      if (Sec2 != Obj->section_end())
-        SectionRelocMap[*Sec2].push_back(Section);
-    }
-    MappingDone = true;
-  }
-  return SectionRelocMap[Sec];
-}
-
-static bool collectRelocatedSymbols(const ObjectFile *Obj,
-                                    const SectionRef &Sec, uint64_t SecAddress,
-                                    uint64_t SymAddress, uint64_t SymSize,
-                                    StringRef *I, StringRef *E) {
-  uint64_t SymOffset = SymAddress - SecAddress;
-  uint64_t SymEnd = SymOffset + SymSize;
-  for (const SectionRef &SR : getRelocSections(Obj, Sec)) {
-    for (const object::RelocationRef &Reloc : SR.relocations()) {
-      if (I == E)
-        break;
-      const object::symbol_iterator RelocSymI = Reloc.getSymbol();
-      if (RelocSymI == Obj->symbol_end())
-        continue;
-      StringRef RelocSymName;
-      if (error(RelocSymI->getName(RelocSymName)))
-        return true;
-      uint64_t Offset;
-      if (error(Reloc.getOffset(Offset)))
-        return true;
-      if (Offset >= SymOffset && Offset < SymEnd) {
-        *I = RelocSymName;
-        ++I;
-      }
-    }
-  }
-  return false;
-}
-
-static bool collectRelocationOffsets(
-    const ObjectFile *Obj, const SectionRef &Sec, uint64_t SecAddress,
-    uint64_t SymAddress, uint64_t SymSize, StringRef SymName,
-    std::map<std::pair<StringRef, uint64_t>, StringRef> &Collection) {
-  uint64_t SymOffset = SymAddress - SecAddress;
-  uint64_t SymEnd = SymOffset + SymSize;
-  for (const SectionRef &SR : getRelocSections(Obj, Sec)) {
-    for (const object::RelocationRef &Reloc : SR.relocations()) {
-      const object::symbol_iterator RelocSymI = Reloc.getSymbol();
-      if (RelocSymI == Obj->symbol_end())
-        continue;
-      StringRef RelocSymName;
-      if (error(RelocSymI->getName(RelocSymName)))
-        return true;
-      uint64_t Offset;
-      if (error(Reloc.getOffset(Offset)))
-        return true;
-      if (Offset >= SymOffset && Offset < SymEnd)
-        Collection[std::make_pair(SymName, Offset - SymOffset)] = RelocSymName;
-    }
-  }
-  return false;
-}
-
-static void dumpVTables(const ObjectFile *Obj) {
-  struct CompleteObjectLocator {
-    StringRef Symbols[2];
-    ArrayRef<little32_t> Data;
-  };
-  struct ClassHierarchyDescriptor {
-    StringRef Symbols[1];
-    ArrayRef<little32_t> Data;
-  };
-  struct BaseClassDescriptor {
-    StringRef Symbols[2];
-    ArrayRef<little32_t> Data;
-  };
-  struct TypeDescriptor {
-    StringRef Symbols[1];
-    uint64_t AlwaysZero;
-    StringRef MangledName;
-  };
-  struct ThrowInfo {
-    uint32_t Flags;
-  };
-  struct CatchableTypeArray {
-    uint32_t NumEntries;
-  };
-  struct CatchableType {
-    uint32_t Flags;
-    uint32_t NonVirtualBaseAdjustmentOffset;
-    int32_t VirtualBasePointerOffset;
-    uint32_t VirtualBaseAdjustmentOffset;
-    uint32_t Size;
-    StringRef Symbols[2];
-  };
-  std::map<std::pair<StringRef, uint64_t>, StringRef> VFTableEntries;
-  std::map<std::pair<StringRef, uint64_t>, StringRef> TIEntries;
-  std::map<std::pair<StringRef, uint64_t>, StringRef> CTAEntries;
-  std::map<StringRef, ArrayRef<little32_t>> VBTables;
-  std::map<StringRef, CompleteObjectLocator> COLs;
-  std::map<StringRef, ClassHierarchyDescriptor> CHDs;
-  std::map<std::pair<StringRef, uint64_t>, StringRef> BCAEntries;
-  std::map<StringRef, BaseClassDescriptor> BCDs;
-  std::map<StringRef, TypeDescriptor> TDs;
-  std::map<StringRef, ThrowInfo> TIs;
-  std::map<StringRef, CatchableTypeArray> CTAs;
-  std::map<StringRef, CatchableType> CTs;
-
-  std::map<std::pair<StringRef, uint64_t>, StringRef> VTableSymEntries;
-  std::map<std::pair<StringRef, uint64_t>, int64_t> VTableDataEntries;
-  std::map<std::pair<StringRef, uint64_t>, StringRef> VTTEntries;
-  std::map<StringRef, StringRef> TINames;
-
-  uint8_t BytesInAddress = Obj->getBytesInAddress();
-
-  for (const object::SymbolRef &Sym : Obj->symbols()) {
-    StringRef SymName;
-    if (error(Sym.getName(SymName)))
-      return;
-    object::section_iterator SecI(Obj->section_begin());
-    if (error(Sym.getSection(SecI)))
-      return;
-    // Skip external symbols.
-    if (SecI == Obj->section_end())
-      continue;
-    const SectionRef &Sec = *SecI;
-    // Skip virtual or BSS sections.
-    if (Sec.isBSS() || Sec.isVirtual())
-      continue;
-    StringRef SecContents;
-    if (error(Sec.getContents(SecContents)))
-      return;
-    uint64_t SymAddress, SymSize;
-    if (error(Sym.getAddress(SymAddress)) || error(Sym.getSize(SymSize)))
-      return;
-    uint64_t SecAddress = Sec.getAddress();
-    uint64_t SecSize = Sec.getSize();
-    uint64_t SymOffset = SymAddress - SecAddress;
-    StringRef SymContents = SecContents.substr(SymOffset, SymSize);
-
-    // VFTables in the MS-ABI start with '??_7' and are contained within their
-    // own COMDAT section.  We then determine the contents of the VFTable by
-    // looking at each relocation in the section.
-    if (SymName.startswith("??_7")) {
-      // Each relocation either names a virtual method or a thunk.  We note the
-      // offset into the section and the symbol used for the relocation.
-      collectRelocationOffsets(Obj, Sec, SecAddress, SecAddress, SecSize,
-                               SymName, VFTableEntries);
-    }
-    // VBTables in the MS-ABI start with '??_8' and are filled with 32-bit
-    // offsets of virtual bases.
-    else if (SymName.startswith("??_8")) {
-      ArrayRef<little32_t> VBTableData(
-          reinterpret_cast<const little32_t *>(SymContents.data()),
-          SymContents.size() / sizeof(little32_t));
-      VBTables[SymName] = VBTableData;
-    }
-    // Complete object locators in the MS-ABI start with '??_R4'
-    else if (SymName.startswith("??_R4")) {
-      CompleteObjectLocator COL;
-      COL.Data = ArrayRef<little32_t>(
-          reinterpret_cast<const little32_t *>(SymContents.data()), 3);
-      StringRef *I = std::begin(COL.Symbols), *E = std::end(COL.Symbols);
-      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
-                                  E))
-        return;
-      COLs[SymName] = COL;
-    }
-    // Class hierarchy descriptors in the MS-ABI start with '??_R3'
-    else if (SymName.startswith("??_R3")) {
-      ClassHierarchyDescriptor CHD;
-      CHD.Data = ArrayRef<little32_t>(
-          reinterpret_cast<const little32_t *>(SymContents.data()), 3);
-      StringRef *I = std::begin(CHD.Symbols), *E = std::end(CHD.Symbols);
-      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
-                                  E))
-        return;
-      CHDs[SymName] = CHD;
-    }
-    // Class hierarchy descriptors in the MS-ABI start with '??_R2'
-    else if (SymName.startswith("??_R2")) {
-      // Each relocation names a base class descriptor.  We note the offset into
-      // the section and the symbol used for the relocation.
-      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
-                               SymName, BCAEntries);
-    }
-    // Base class descriptors in the MS-ABI start with '??_R1'
-    else if (SymName.startswith("??_R1")) {
-      BaseClassDescriptor BCD;
-      BCD.Data = ArrayRef<little32_t>(
-          reinterpret_cast<const little32_t *>(SymContents.data()) + 1, 5);
-      StringRef *I = std::begin(BCD.Symbols), *E = std::end(BCD.Symbols);
-      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
-                                  E))
-        return;
-      BCDs[SymName] = BCD;
-    }
-    // Type descriptors in the MS-ABI start with '??_R0'
-    else if (SymName.startswith("??_R0")) {
-      const char *DataPtr = SymContents.drop_front(BytesInAddress).data();
-      TypeDescriptor TD;
-      if (BytesInAddress == 8)
-        TD.AlwaysZero = *reinterpret_cast<const little64_t *>(DataPtr);
-      else
-        TD.AlwaysZero = *reinterpret_cast<const little32_t *>(DataPtr);
-      TD.MangledName = SymContents.drop_front(BytesInAddress * 2);
-      StringRef *I = std::begin(TD.Symbols), *E = std::end(TD.Symbols);
-      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
-                                  E))
-        return;
-      TDs[SymName] = TD;
-    }
-    // Throw descriptors in the MS-ABI start with '_TI'
-    else if (SymName.startswith("_TI") || SymName.startswith("__TI")) {
-      ThrowInfo TI;
-      TI.Flags = *reinterpret_cast<const little32_t *>(SymContents.data());
-      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
-                               SymName, TIEntries);
-      TIs[SymName] = TI;
-    }
-    // Catchable type arrays in the MS-ABI start with _CTA or __CTA.
-    else if (SymName.startswith("_CTA") || SymName.startswith("__CTA")) {
-      CatchableTypeArray CTA;
-      CTA.NumEntries =
-          *reinterpret_cast<const little32_t *>(SymContents.data());
-      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
-                               SymName, CTAEntries);
-      CTAs[SymName] = CTA;
-    }
-    // Catchable types in the MS-ABI start with _CT or __CT.
-    else if (SymName.startswith("_CT") || SymName.startswith("__CT")) {
-      const little32_t *DataPtr =
-          reinterpret_cast<const little32_t *>(SymContents.data());
-      CatchableType CT;
-      CT.Flags = DataPtr[0];
-      CT.NonVirtualBaseAdjustmentOffset = DataPtr[2];
-      CT.VirtualBasePointerOffset = DataPtr[3];
-      CT.VirtualBaseAdjustmentOffset = DataPtr[4];
-      CT.Size = DataPtr[5];
-      StringRef *I = std::begin(CT.Symbols), *E = std::end(CT.Symbols);
-      if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I,
-                                  E))
-        return;
-      CTs[SymName] = CT;
-    }
-    // Construction vtables in the Itanium ABI start with '_ZTT' or '__ZTT'.
-    else if (SymName.startswith("_ZTT") || SymName.startswith("__ZTT")) {
-      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
-                               SymName, VTTEntries);
-    }
-    // Typeinfo names in the Itanium ABI start with '_ZTS' or '__ZTS'.
-    else if (SymName.startswith("_ZTS") || SymName.startswith("__ZTS")) {
-      TINames[SymName] = SymContents.slice(0, SymContents.find('\0'));
-    }
-    // Vtables in the Itanium ABI start with '_ZTV' or '__ZTV'.
-    else if (SymName.startswith("_ZTV") || SymName.startswith("__ZTV")) {
-      collectRelocationOffsets(Obj, Sec, SecAddress, SymAddress, SymSize,
-                               SymName, VTableSymEntries);
-      for (uint64_t SymOffI = 0; SymOffI < SymSize; SymOffI += BytesInAddress) {
-        auto Key = std::make_pair(SymName, SymOffI);
-        if (VTableSymEntries.count(Key))
-          continue;
-        const char *DataPtr = SymContents.substr(SymOffI, BytesInAddress).data();
-        int64_t VData;
-        if (BytesInAddress == 8)
-          VData = *reinterpret_cast<const little64_t *>(DataPtr);
-        else
-          VData = *reinterpret_cast<const little32_t *>(DataPtr);
-        VTableDataEntries[Key] = VData;
-      }
-    }
-    // Typeinfo structures in the Itanium ABI start with '_ZTI' or '__ZTI'.
-    else if (SymName.startswith("_ZTI") || SymName.startswith("__ZTI")) {
-      // FIXME: Do something with these!
-    }
-  }
-  for (const std::pair<std::pair<StringRef, uint64_t>, StringRef> &VFTableEntry :
-       VFTableEntries) {
-    StringRef VFTableName = VFTableEntry.first.first;
-    uint64_t Offset = VFTableEntry.first.second;
-    StringRef SymName = VFTableEntry.second;
-    outs() << VFTableName << '[' << Offset << "]: " << SymName << '\n';
-  }
-  for (const std::pair<StringRef, ArrayRef<little32_t>> &VBTable : VBTables) {
-    StringRef VBTableName = VBTable.first;
-    uint32_t Idx = 0;
-    for (little32_t Offset : VBTable.second) {
-      outs() << VBTableName << '[' << Idx << "]: " << Offset << '\n';
-      Idx += sizeof(Offset);
-    }
-  }
-  for (const std::pair<StringRef, CompleteObjectLocator> &COLPair : COLs) {
-    StringRef COLName = COLPair.first;
-    const CompleteObjectLocator &COL = COLPair.second;
-    outs() << COLName << "[IsImageRelative]: " << COL.Data[0] << '\n';
-    outs() << COLName << "[OffsetToTop]: " << COL.Data[1] << '\n';
-    outs() << COLName << "[VFPtrOffset]: " << COL.Data[2] << '\n';
-    outs() << COLName << "[TypeDescriptor]: " << COL.Symbols[0] << '\n';
-    outs() << COLName << "[ClassHierarchyDescriptor]: " << COL.Symbols[1] << '\n';
-  }
-  for (const std::pair<StringRef, ClassHierarchyDescriptor> &CHDPair : CHDs) {
-    StringRef CHDName = CHDPair.first;
-    const ClassHierarchyDescriptor &CHD = CHDPair.second;
-    outs() << CHDName << "[AlwaysZero]: " << CHD.Data[0] << '\n';
-    outs() << CHDName << "[Flags]: " << CHD.Data[1] << '\n';
-    outs() << CHDName << "[NumClasses]: " << CHD.Data[2] << '\n';
-    outs() << CHDName << "[BaseClassArray]: " << CHD.Symbols[0] << '\n';
-  }
-  for (const std::pair<std::pair<StringRef, uint64_t>, StringRef> &BCAEntry :
-       BCAEntries) {
-    StringRef BCAName = BCAEntry.first.first;
-    uint64_t Offset = BCAEntry.first.second;
-    StringRef SymName = BCAEntry.second;
-    outs() << BCAName << '[' << Offset << "]: " << SymName << '\n';
-  }
-  for (const std::pair<StringRef, BaseClassDescriptor> &BCDPair : BCDs) {
-    StringRef BCDName = BCDPair.first;
-    const BaseClassDescriptor &BCD = BCDPair.second;
-    outs() << BCDName << "[TypeDescriptor]: " << BCD.Symbols[0] << '\n';
-    outs() << BCDName << "[NumBases]: " << BCD.Data[0] << '\n';
-    outs() << BCDName << "[OffsetInVBase]: " << BCD.Data[1] << '\n';
-    outs() << BCDName << "[VBPtrOffset]: " << BCD.Data[2] << '\n';
-    outs() << BCDName << "[OffsetInVBTable]: " << BCD.Data[3] << '\n';
-    outs() << BCDName << "[Flags]: " << BCD.Data[4] << '\n';
-    outs() << BCDName << "[ClassHierarchyDescriptor]: " << BCD.Symbols[1] << '\n';
-  }
-  for (const std::pair<StringRef, TypeDescriptor> &TDPair : TDs) {
-    StringRef TDName = TDPair.first;
-    const TypeDescriptor &TD = TDPair.second;
-    outs() << TDName << "[VFPtr]: " << TD.Symbols[0] << '\n';
-    outs() << TDName << "[AlwaysZero]: " << TD.AlwaysZero << '\n';
-    outs() << TDName << "[MangledName]: ";
-    outs().write_escaped(TD.MangledName.rtrim(StringRef("\0", 1)),
-                         /*UseHexEscapes=*/true)
-        << '\n';
-  }
-  for (const std::pair<StringRef, ThrowInfo> &TIPair : TIs) {
-    StringRef TIName = TIPair.first;
-    const ThrowInfo &TI = TIPair.second;
-    auto dumpThrowInfoFlag = [&](const char *Name, uint32_t Flag) {
-      outs() << TIName << "[Flags." << Name
-             << "]: " << (TI.Flags & Flag ? "true" : "false") << '\n';
-    };
-    auto dumpThrowInfoSymbol = [&](const char *Name, int Offset) {
-      outs() << TIName << '[' << Name << "]: ";
-      auto Entry = TIEntries.find(std::make_pair(TIName, Offset));
-      outs() << (Entry == TIEntries.end() ? "null" : Entry->second) << '\n';
-    };
-    outs() << TIName << "[Flags]: " << TI.Flags << '\n';
-    dumpThrowInfoFlag("Const", 1);
-    dumpThrowInfoFlag("Volatile", 2);
-    dumpThrowInfoSymbol("CleanupFn", 4);
-    dumpThrowInfoSymbol("ForwardCompat", 8);
-    dumpThrowInfoSymbol("CatchableTypeArray", 12);
-  }
-  for (const std::pair<StringRef, CatchableTypeArray> &CTAPair : CTAs) {
-    StringRef CTAName = CTAPair.first;
-    const CatchableTypeArray &CTA = CTAPair.second;
-
-    outs() << CTAName << "[NumEntries]: " << CTA.NumEntries << '\n';
-
-    unsigned Idx = 0;
-    for (auto I = CTAEntries.lower_bound(std::make_pair(CTAName, 0)),
-              E = CTAEntries.upper_bound(std::make_pair(CTAName, UINT64_MAX));
-         I != E; ++I)
-      outs() << CTAName << '[' << Idx++ << "]: " << I->second << '\n';
-  }
-  for (const std::pair<StringRef, CatchableType> &CTPair : CTs) {
-    StringRef CTName = CTPair.first;
-    const CatchableType &CT = CTPair.second;
-    auto dumpCatchableTypeFlag = [&](const char *Name, uint32_t Flag) {
-      outs() << CTName << "[Flags." << Name
-             << "]: " << (CT.Flags & Flag ? "true" : "false") << '\n';
-    };
-    outs() << CTName << "[Flags]: " << CT.Flags << '\n';
-    dumpCatchableTypeFlag("ScalarType", 1);
-    dumpCatchableTypeFlag("VirtualInheritance", 4);
-    outs() << CTName << "[TypeDescriptor]: " << CT.Symbols[0] << '\n';
-    outs() << CTName << "[NonVirtualBaseAdjustmentOffset]: "
-           << CT.NonVirtualBaseAdjustmentOffset << '\n';
-    outs() << CTName
-           << "[VirtualBasePointerOffset]: " << CT.VirtualBasePointerOffset
-           << '\n';
-    outs() << CTName << "[VirtualBaseAdjustmentOffset]: "
-           << CT.VirtualBaseAdjustmentOffset << '\n';
-    outs() << CTName << "[Size]: " << CT.Size << '\n';
-    outs() << CTName
-           << "[CopyCtor]: " << (CT.Symbols[1].empty() ? "null" : CT.Symbols[1])
-           << '\n';
-  }
-  for (const std::pair<std::pair<StringRef, uint64_t>, StringRef> &VTTPair :
-       VTTEntries) {
-    StringRef VTTName = VTTPair.first.first;
-    uint64_t VTTOffset = VTTPair.first.second;
-    StringRef VTTEntry = VTTPair.second;
-    outs() << VTTName << '[' << VTTOffset << "]: " << VTTEntry << '\n';
-  }
-  for (const std::pair<StringRef, StringRef> &TIPair : TINames) {
-    StringRef TIName = TIPair.first;
-    outs() << TIName << ": " << TIPair.second << '\n';
-  }
-  auto VTableSymI = VTableSymEntries.begin();
-  auto VTableSymE = VTableSymEntries.end();
-  auto VTableDataI = VTableDataEntries.begin();
-  auto VTableDataE = VTableDataEntries.end();
-  for (;;) {
-    bool SymDone = VTableSymI == VTableSymE;
-    bool DataDone = VTableDataI == VTableDataE;
-    if (SymDone && DataDone)
-      break;
-    if (!SymDone && (DataDone || VTableSymI->first < VTableDataI->first)) {
-      StringRef VTableName = VTableSymI->first.first;
-      uint64_t Offset = VTableSymI->first.second;
-      StringRef VTableEntry = VTableSymI->second;
-      outs() << VTableName << '[' << Offset << "]: ";
-      outs() << VTableEntry;
-      outs() << '\n';
-      ++VTableSymI;
-      continue;
-    }
-    if (!DataDone && (SymDone || VTableDataI->first < VTableSymI->first)) {
-      StringRef VTableName = VTableDataI->first.first;
-      uint64_t Offset = VTableDataI->first.second;
-      int64_t VTableEntry = VTableDataI->second;
-      outs() << VTableName << '[' << Offset << "]: ";
-      outs() << VTableEntry;
-      outs() << '\n';
-      ++VTableDataI;
-      continue;
-    }
-  }
-}
-
-static void dumpArchive(const Archive *Arc) {
-  for (const Archive::Child &ArcC : Arc->children()) {
-    ErrorOr<std::unique_ptr<Binary>> ChildOrErr = ArcC.getAsBinary();
-    if (std::error_code EC = ChildOrErr.getError()) {
-      // Ignore non-object files.
-      if (EC != object_error::invalid_file_type)
-        reportError(Arc->getFileName(), EC.message());
-      continue;
-    }
-
-    if (ObjectFile *Obj = dyn_cast<ObjectFile>(&*ChildOrErr.get()))
-      dumpVTables(Obj);
-    else
-      reportError(Arc->getFileName(),
-                  vtabledump_error::unrecognized_file_format);
-  }
-}
-
-static void dumpInput(StringRef File) {
-  // If file isn't stdin, check that it exists.
-  if (File != "-" && !sys::fs::exists(File)) {
-    reportError(File, vtabledump_error::file_not_found);
-    return;
-  }
-
-  // Attempt to open the binary.
-  ErrorOr<OwningBinary<Binary>> BinaryOrErr = createBinary(File);
-  if (std::error_code EC = BinaryOrErr.getError()) {
-    reportError(File, EC);
-    return;
-  }
-  Binary &Binary = *BinaryOrErr.get().getBinary();
-
-  if (Archive *Arc = dyn_cast<Archive>(&Binary))
-    dumpArchive(Arc);
-  else if (ObjectFile *Obj = dyn_cast<ObjectFile>(&Binary))
-    dumpVTables(Obj);
-  else
-    reportError(File, vtabledump_error::unrecognized_file_format);
-}
-
-int main(int argc, const char *argv[]) {
-  sys::PrintStackTraceOnErrorSignal();
-  PrettyStackTraceProgram X(argc, argv);
-  llvm_shutdown_obj Y;
-
-  // Initialize targets.
-  llvm::InitializeAllTargetInfos();
-
-  // Register the target printer for --version.
-  cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
-
-  cl::ParseCommandLineOptions(argc, argv, "LLVM VTable Dumper\n");
-
-  // Default to stdin if no filename is specified.
-  if (opts::InputFilenames.size() == 0)
-    opts::InputFilenames.push_back("-");
-
-  std::for_each(opts::InputFilenames.begin(), opts::InputFilenames.end(),
-                dumpInput);
-
-  return ReturnValue;
-}
diff --git a/tools/llvm-vtabledump/llvm-vtabledump.h b/tools/llvm-vtabledump/llvm-vtabledump.h
deleted file mode 100644
index 62f755739c3..00000000000
--- a/tools/llvm-vtabledump/llvm-vtabledump.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//===-- llvm-vtabledump.h ---------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_VTABLEDUMP_LLVM_VTABLEDUMP_H
-#define LLVM_TOOLS_LLVM_VTABLEDUMP_LLVM_VTABLEDUMP_H
-
-#include "llvm/Support/CommandLine.h"
-#include <string>
-
-namespace opts {
-extern llvm::cl::list<std::string> InputFilenames;
-} // namespace opts
-
-#define LLVM_VTABLEDUMP_ENUM_ENT(ns, enum)                                     \
-  { #enum, ns::enum }
-
-#endif