From 86ee1737122a486aadb2862b977175f65b4a3aa5 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 27 Feb 2015 22:35:25 +0000 Subject: [PATCH] llvm-vtabledump: Update field with a better name llvm-svn: 230804 --- llvm/test/tools/llvm-vtabledump/eh.test | 26 +++++++++++++------------- llvm/tools/llvm-vtabledump/llvm-vtabledump.cpp | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/llvm/test/tools/llvm-vtabledump/eh.test b/llvm/test/tools/llvm-vtabledump/eh.test index bcb6358..1c43e0e 100644 --- a/llvm/test/tools/llvm-vtabledump/eh.test +++ b/llvm/test/tools/llvm-vtabledump/eh.test @@ -146,7 +146,7 @@ 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[SizeOrOffset]: 4 +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 @@ -155,7 +155,7 @@ 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[SizeOrOffset]: 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 @@ -164,7 +164,7 @@ 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[SizeOrOffset]: 4 +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 @@ -173,7 +173,7 @@ 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[SizeOrOffset]: 4 +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 @@ -182,7 +182,7 @@ 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[SizeOrOffset]: 8 +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 @@ -191,7 +191,7 @@ 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[SizeOrOffset]: 16 +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 @@ -200,7 +200,7 @@ 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[SizeOrOffset]: 4 +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 @@ -209,7 +209,7 @@ 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[SizeOrOffset]: 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 @@ -218,7 +218,7 @@ 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[SizeOrOffset]: 4 +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 @@ -227,7 +227,7 @@ 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[SizeOrOffset]: 4 +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 @@ -236,7 +236,7 @@ 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[SizeOrOffset]: 4 +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 @@ -245,7 +245,7 @@ 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[SizeOrOffset]: 4 +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 @@ -254,5 +254,5 @@ 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[SizeOrOffset]: 8 +COFF-I386: __CT??_R0PQS@@H@88[Size]: 8 COFF-I386: __CT??_R0PQS@@H@88[CopyCtor]: null diff --git a/llvm/tools/llvm-vtabledump/llvm-vtabledump.cpp b/llvm/tools/llvm-vtabledump/llvm-vtabledump.cpp index 0447982..c5bf9d6 100644 --- a/llvm/tools/llvm-vtabledump/llvm-vtabledump.cpp +++ b/llvm/tools/llvm-vtabledump/llvm-vtabledump.cpp @@ -163,7 +163,7 @@ static void dumpVTables(const ObjectFile *Obj) { uint32_t NonVirtualBaseAdjustmentOffset; int32_t VirtualBasePointerOffset; uint32_t VirtualBaseAdjustmentOffset; - uint32_t SizeOrOffset; + uint32_t Size; StringRef Symbols[2]; }; std::map, StringRef> VFTableEntries; @@ -309,7 +309,7 @@ static void dumpVTables(const ObjectFile *Obj) { CT.NonVirtualBaseAdjustmentOffset = DataPtr[2]; CT.VirtualBasePointerOffset = DataPtr[3]; CT.VirtualBaseAdjustmentOffset = DataPtr[4]; - CT.SizeOrOffset = DataPtr[5]; + CT.Size = DataPtr[5]; StringRef *I = std::begin(CT.Symbols), *E = std::end(CT.Symbols); if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, E)) @@ -456,7 +456,7 @@ static void dumpVTables(const ObjectFile *Obj) { << '\n'; outs() << CTName << "[VirtualBaseAdjustmentOffset]: " << CT.VirtualBaseAdjustmentOffset << '\n'; - outs() << CTName << "[SizeOrOffset]: " << CT.SizeOrOffset << '\n'; + outs() << CTName << "[Size]: " << CT.Size << '\n'; outs() << CTName << "[CopyCtor]: " << (CT.Symbols[1].empty() ? "null" : CT.Symbols[1]) << '\n'; -- 2.7.4