mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-20 03:23:01 +02:00
Revert "[CodeView] Emit static data members as S_CONSTANTs."
Seems like there's an assert in here that we shouldn't be running into. This reverts commit 515973222ed29abe49f241e89edb6854f44162d4.
This commit is contained in:
Amy Huang
parent
05d3fe531a
commit
d210bc3179
@ -588,18 +588,13 @@ void CodeViewDebug::endModule() {
|
||||
if (!P.first->isDeclarationForLinker())
|
||||
emitDebugInfoForFunction(P.first, *P.second);
|
||||
|
||||
// Get types used by globals without emitting anything.
|
||||
// This is meant to collect all static const data members so they can be
|
||||
// emitted as globals.
|
||||
collectDebugInfoForGlobals();
|
||||
|
||||
// Emit retained types.
|
||||
emitDebugInfoForRetainedTypes();
|
||||
|
||||
// Emit global variable debug information.
|
||||
setCurrentSubprogram(nullptr);
|
||||
emitDebugInfoForGlobals();
|
||||
|
||||
// Emit retained types.
|
||||
emitDebugInfoForRetainedTypes();
|
||||
|
||||
// Switch back to the generic .debug$S section after potentially processing
|
||||
// comdat symbol sections.
|
||||
switchToDebugSectionForSymbol(nullptr);
|
||||
@ -2148,12 +2143,6 @@ void CodeViewDebug::collectMemberInfo(ClassInfo &Info,
|
||||
const DIDerivedType *DDTy) {
|
||||
if (!DDTy->getName().empty()) {
|
||||
Info.Members.push_back({DDTy, 0});
|
||||
|
||||
// Collect static const data members.
|
||||
if ((DDTy->getFlags() & DINode::FlagStaticMember) ==
|
||||
DINode::FlagStaticMember)
|
||||
StaticConstMembers.push_back(DDTy);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@ -3056,32 +3045,15 @@ void CodeViewDebug::collectGlobalVariableInfo() {
|
||||
}
|
||||
}
|
||||
|
||||
void CodeViewDebug::collectDebugInfoForGlobals() {
|
||||
for (const CVGlobalVariable &CVGV : GlobalVariables) {
|
||||
const DIGlobalVariable *DIGV = CVGV.DIGV;
|
||||
const DIScope *Scope = DIGV->getScope();
|
||||
getCompleteTypeIndex(DIGV->getType());
|
||||
getFullyQualifiedName(Scope, DIGV->getName());
|
||||
}
|
||||
|
||||
for (const CVGlobalVariable &CVGV : ComdatVariables) {
|
||||
const DIGlobalVariable *DIGV = CVGV.DIGV;
|
||||
const DIScope *Scope = DIGV->getScope();
|
||||
getCompleteTypeIndex(DIGV->getType());
|
||||
getFullyQualifiedName(Scope, DIGV->getName());
|
||||
}
|
||||
}
|
||||
|
||||
void CodeViewDebug::emitDebugInfoForGlobals() {
|
||||
// First, emit all globals that are not in a comdat in a single symbol
|
||||
// substream. MSVC doesn't like it if the substream is empty, so only open
|
||||
// it if we have at least one global to emit.
|
||||
switchToDebugSectionForSymbol(nullptr);
|
||||
if (!GlobalVariables.empty() || !StaticConstMembers.empty()) {
|
||||
if (!GlobalVariables.empty()) {
|
||||
OS.AddComment("Symbol subsection for globals");
|
||||
MCSymbol *EndLabel = beginCVSubsection(DebugSubsectionKind::Symbols);
|
||||
emitGlobalVariableList(GlobalVariables);
|
||||
emitStaticConstMemberList();
|
||||
endCVSubsection(EndLabel);
|
||||
}
|
||||
|
||||
@ -3120,64 +3092,6 @@ void CodeViewDebug::emitGlobalVariableList(ArrayRef<CVGlobalVariable> Globals) {
|
||||
}
|
||||
}
|
||||
|
||||
// Return true if type encoding is unsigned.
|
||||
static bool isStaticConstUnsigned(const DIType *Ty) {
|
||||
if (const auto *CTy = dyn_cast<DICompositeType>(Ty)) {
|
||||
if (CTy->getTag() == dwarf::DW_TAG_enumeration_type) {
|
||||
assert(CTy->getBaseType() && "Expected valid base type");
|
||||
return isStaticConstUnsigned(CTy->getBaseType());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
if (const auto *DTy = dyn_cast<DIDerivedType>(Ty)) {
|
||||
assert(DTy->getBaseType() && "Expected valid base type");
|
||||
return isStaticConstUnsigned(DTy->getBaseType());
|
||||
}
|
||||
|
||||
const auto *BTy = cast<DIBasicType>(Ty);
|
||||
unsigned Encoding = BTy->getEncoding();
|
||||
return Encoding == dwarf::DW_ATE_unsigned ||
|
||||
Encoding == dwarf::DW_ATE_unsigned_char ||
|
||||
Encoding == dwarf::DW_ATE_UTF || Encoding == dwarf::DW_ATE_boolean ||
|
||||
Ty->getTag() == dwarf::DW_TAG_unspecified_type;
|
||||
}
|
||||
|
||||
void CodeViewDebug::emitStaticConstMemberList() {
|
||||
for (const DIDerivedType *DTy : StaticConstMembers) {
|
||||
const DIScope *Scope = DTy->getScope();
|
||||
|
||||
APSInt Value;
|
||||
if (const ConstantInt *CI =
|
||||
dyn_cast_or_null<ConstantInt>(DTy->getConstant()))
|
||||
Value = APSInt(CI->getValue(), isStaticConstUnsigned(DTy->getBaseType()));
|
||||
else if (const ConstantFP *CFP =
|
||||
dyn_cast_or_null<ConstantFP>(DTy->getConstant()))
|
||||
Value = APSInt(CFP->getValueAPF().bitcastToAPInt(), true);
|
||||
else
|
||||
continue;
|
||||
|
||||
std::string QualifiedName = getFullyQualifiedName(Scope, DTy->getName());
|
||||
|
||||
MCSymbol *SConstantEnd = beginSymbolRecord(SymbolKind::S_CONSTANT);
|
||||
OS.AddComment("Type");
|
||||
OS.emitInt32(getTypeIndex(DTy->getBaseType()).getIndex());
|
||||
OS.AddComment("Value");
|
||||
|
||||
// Encoded integers shouldn't need more than 10 bytes.
|
||||
uint8_t Data[10];
|
||||
BinaryStreamWriter Writer(Data, llvm::support::endianness::little);
|
||||
CodeViewRecordIO IO(Writer);
|
||||
cantFail(IO.mapEncodedInteger(Value));
|
||||
StringRef SRef((char *)Data, Writer.getOffset());
|
||||
OS.emitBinaryData(SRef);
|
||||
|
||||
OS.AddComment("Name");
|
||||
emitNullTerminatedSymbolName(OS, QualifiedName);
|
||||
endSymbolRecord(SConstantEnd);
|
||||
}
|
||||
}
|
||||
|
||||
void CodeViewDebug::emitDebugInfoForGlobal(const CVGlobalVariable &CVGV) {
|
||||
const DIGlobalVariable *DIGV = CVGV.DIGV;
|
||||
|
||||
|
||||
@ -203,9 +203,6 @@ class LLVM_LIBRARY_VISIBILITY CodeViewDebug : public DebugHandlerBase {
|
||||
// Array of non-COMDAT global variables.
|
||||
SmallVector<CVGlobalVariable, 1> GlobalVariables;
|
||||
|
||||
/// List of static const data members to be emitted as S_CONSTANTs.
|
||||
SmallVector<const DIDerivedType *, 4> StaticConstMembers;
|
||||
|
||||
/// The set of comdat .debug$S sections that we've seen so far. Each section
|
||||
/// must start with a magic version number that must only be emitted once.
|
||||
/// This set tracks which sections we've already opened.
|
||||
@ -316,11 +313,9 @@ class LLVM_LIBRARY_VISIBILITY CodeViewDebug : public DebugHandlerBase {
|
||||
void emitDebugInfoForUDTs(
|
||||
const std::vector<std::pair<std::string, const DIType *>> &UDTs);
|
||||
|
||||
void collectDebugInfoForGlobals();
|
||||
void emitDebugInfoForGlobals();
|
||||
void emitGlobalVariableList(ArrayRef<CVGlobalVariable> Globals);
|
||||
void emitDebugInfoForGlobal(const CVGlobalVariable &CVGV);
|
||||
void emitStaticConstMemberList();
|
||||
|
||||
/// Opens a subsection of the given kind in a .debug$S codeview section.
|
||||
/// Returns an end label for use with endCVSubsection when the subsection is
|
||||
|
||||
@ -273,6 +273,7 @@ Error CodeViewRecordIO::mapStringZVectorZ(std::vector<StringRef> &Value,
|
||||
|
||||
void CodeViewRecordIO::emitEncodedSignedInteger(const int64_t &Value,
|
||||
const Twine &Comment) {
|
||||
assert(Value < 0 && "Encoded integer is not signed!");
|
||||
if (Value >= std::numeric_limits<int8_t>::min()) {
|
||||
Streamer->emitIntValue(LF_CHAR, 2);
|
||||
emitComment(Comment);
|
||||
@ -321,6 +322,7 @@ void CodeViewRecordIO::emitEncodedUnsignedInteger(const uint64_t &Value,
|
||||
}
|
||||
|
||||
Error CodeViewRecordIO::writeEncodedSignedInteger(const int64_t &Value) {
|
||||
assert(Value < 0 && "Encoded integer is not signed!");
|
||||
if (Value >= std::numeric_limits<int8_t>::min()) {
|
||||
if (auto EC = Writer->writeInteger<uint16_t>(LF_CHAR))
|
||||
return EC;
|
||||
|
||||
@ -7,9 +7,6 @@
|
||||
; }
|
||||
; struct S {
|
||||
; static const int TestConst2 = -10;
|
||||
; // Unused static consts should still be emitted.
|
||||
; static const int TestConst3 = 3;
|
||||
; static constexpr int TestConst 4 = 4;
|
||||
; enum { SEnum = 42 };
|
||||
; };
|
||||
; enum TestEnum : int {
|
||||
@ -37,6 +34,14 @@
|
||||
|
||||
; ASM: .short 4359 # Record kind: S_CONSTANT
|
||||
; ASM-NEXT: .long 4101 # Type
|
||||
; ASM-NEXT: .byte 0x0a, 0x80, 0xf6, 0xff # Value
|
||||
; ASM-NEXT: .byte 0xff, 0xff, 0xff, 0xff
|
||||
; ASM-NEXT: .byte 0xff, 0xff
|
||||
; ASM-NEXT: .asciz "S::TestConst2" # Name
|
||||
; ASM-NEXT: .p2align 2
|
||||
|
||||
; ASM: .short 4359 # Record kind: S_CONSTANT
|
||||
; ASM-NEXT: .long 4110 # Type
|
||||
; ASM-NEXT: .byte 0x0a, 0x80, 0x40, 0x61 # Value
|
||||
; ASM-NEXT: .byte 0x07, 0x80, 0xff, 0xff
|
||||
; ASM-NEXT: .byte 0xff, 0xff
|
||||
@ -44,12 +49,6 @@
|
||||
; ASM-NEXT: .p2align 2
|
||||
; ASM-NOT: .asciz "S::SEnum" # Name
|
||||
|
||||
; ASM: .short 4359 # Record kind: S_CONSTANT
|
||||
; ASM-NEXT: .long 4105 # Type
|
||||
; ASM-NEXT: .byte 0x00, 0x80, 0xf6 # Value
|
||||
; ASM-NEXT: .asciz "S::TestConst2" # Name
|
||||
; ASM-NEXT: .p2align 2
|
||||
|
||||
; OBJ: CodeViewDebugInfo [
|
||||
; OBJ: Section: .debug$S
|
||||
; OBJ: Magic: 0x4
|
||||
@ -63,17 +62,17 @@
|
||||
; OBJ-NEXT: }
|
||||
; OBJ-NEXT: ConstantSym {
|
||||
; OBJ-NEXT: Kind: S_CONSTANT (0x1107)
|
||||
; OBJ-NEXT: Type: TestEnum (0x1005)
|
||||
; OBJ-NEXT: Type: const int (0x1005)
|
||||
; OBJ-NEXT: Value: 18446744073709551606
|
||||
; OBJ-NEXT: Name: S::TestConst2
|
||||
; OBJ-NEXT: }
|
||||
; OBJ-NEXT: ConstantSym {
|
||||
; OBJ-NEXT: Kind: S_CONSTANT (0x1107)
|
||||
; OBJ-NEXT: Type: TestEnum (0x100E)
|
||||
; OBJ-NEXT: Value: 18446744071562551616
|
||||
; OBJ-NEXT: Name: ENUM_B
|
||||
; OBJ-NEXT: }
|
||||
; OBJ-NOT: Name: S::SEnum
|
||||
; OBJ-NEXT: ConstantSym {
|
||||
; OBJ-NEXT: Kind: S_CONSTANT (0x1107)
|
||||
; OBJ-NEXT: Type: const int (0x1009)
|
||||
; OBJ-NEXT: Value: -10
|
||||
; OBJ-NEXT: Name: S::TestConst2
|
||||
; OBJ-NEXT: }
|
||||
|
||||
; ModuleID = 'a.cpp'
|
||||
source_filename = "a.cpp"
|
||||
@ -99,43 +98,43 @@ attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-
|
||||
!llvm.module.flags = !{!26, !27, !28, !29}
|
||||
!llvm.ident = !{!30}
|
||||
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 12.0.0 (https://github.com/llvm/llvm-project.git 34cd06a9b3bddaa7a989c606bbf1327ee651711c)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !17, globals: !18, nameTableKind: None)
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 202f144bffd0be254a829924195e1b8ebabcbb79)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !15, globals: !16, nameTableKind: None)
|
||||
!1 = !DIFile(filename: "a.cpp", directory: "F:\\llvm-project\\__test", checksumkind: CSK_MD5, checksum: "a1dbf3aabea9e8f9d1be48f60287942f")
|
||||
!2 = !{!3, !13}
|
||||
!3 = !DICompositeType(tag: DW_TAG_enumeration_type, scope: !4, file: !1, line: 8, baseType: !8, size: 32, elements: !11, identifier: ".?AW4<unnamed-enum-SEnum>@S@@")
|
||||
!2 = !{!3, !11}
|
||||
!3 = !DICompositeType(tag: DW_TAG_enumeration_type, scope: !4, file: !1, line: 6, baseType: !8, size: 32, elements: !9, identifier: ".?AW4<unnamed-enum-SEnum>@S@@")
|
||||
!4 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: !1, line: 4, size: 8, flags: DIFlagTypePassByValue, elements: !5, identifier: ".?AUS@@")
|
||||
!5 = !{!6, !9, !10, !3}
|
||||
!5 = !{!6, !3}
|
||||
!6 = !DIDerivedType(tag: DW_TAG_member, name: "TestConst2", scope: !4, file: !1, line: 5, baseType: !7, flags: DIFlagStaticMember, extraData: i32 -10)
|
||||
!7 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !8)
|
||||
!8 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
|
||||
!9 = !DIDerivedType(tag: DW_TAG_member, name: "TestConst3", scope: !4, file: !1, line: 6, baseType: !7, flags: DIFlagStaticMember, extraData: i32 3)
|
||||
!10 = !DIDerivedType(tag: DW_TAG_member, name: "TestConst4", scope: !4, file: !1, line: 7, baseType: !7, flags: DIFlagStaticMember, extraData: i32 4)
|
||||
!11 = !{!12}
|
||||
!12 = !DIEnumerator(name: "SEnum", value: 42)
|
||||
!13 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "TestEnum", file: !1, line: 10, baseType: !8, size: 32, elements: !14, identifier: ".?AW4TestEnum@@")
|
||||
!14 = !{!15, !16}
|
||||
!15 = !DIEnumerator(name: "ENUM_A", value: 2147000000)
|
||||
!16 = !DIEnumerator(name: "ENUM_B", value: -2147000000)
|
||||
!17 = !{!4}
|
||||
!18 = !{!19, !24}
|
||||
!19 = !DIGlobalVariableExpression(var: !20, expr: !DIExpression(DW_OP_constu, 1078523331, DW_OP_stack_value))
|
||||
!20 = distinct !DIGlobalVariable(name: "TestConst1", scope: !21, file: !1, line: 2, type: !22, isLocal: true, isDefinition: true)
|
||||
!21 = !DINamespace(name: "Test1", scope: null)
|
||||
!22 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !23)
|
||||
!23 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
|
||||
!9 = !{!10}
|
||||
!10 = !DIEnumerator(name: "SEnum", value: 42)
|
||||
!11 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "TestEnum", file: !1, line: 8, baseType: !8, size: 32, elements: !12, identifier: ".?AW4TestEnum@@")
|
||||
!12 = !{!13, !14}
|
||||
!13 = !DIEnumerator(name: "ENUM_A", value: 2147000000)
|
||||
!14 = !DIEnumerator(name: "ENUM_B", value: -2147000000)
|
||||
!15 = !{!4}
|
||||
!16 = !{!17, !22, !24}
|
||||
!17 = !DIGlobalVariableExpression(var: !18, expr: !DIExpression(DW_OP_constu, 1078523331, DW_OP_stack_value))
|
||||
!18 = distinct !DIGlobalVariable(name: "TestConst1", scope: !19, file: !1, line: 2, type: !20, isLocal: true, isDefinition: true)
|
||||
!19 = !DINamespace(name: "Test1", scope: null)
|
||||
!20 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !21)
|
||||
!21 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
|
||||
!22 = !DIGlobalVariableExpression(var: !23, expr: !DIExpression(DW_OP_constu, 18446744073709551606, DW_OP_stack_value))
|
||||
!23 = distinct !DIGlobalVariable(name: "TestConst2", scope: !0, file: !1, line: 5, type: !7, isLocal: true, isDefinition: true, declaration: !6)
|
||||
!24 = !DIGlobalVariableExpression(var: !25, expr: !DIExpression(DW_OP_constu, 18446744071562551616, DW_OP_stack_value))
|
||||
!25 = distinct !DIGlobalVariable(name: "ENUM_B", scope: !0, file: !1, line: 12, type: !13, isLocal: true, isDefinition: true)
|
||||
!25 = distinct !DIGlobalVariable(name: "ENUM_B", scope: !0, file: !1, line: 10, type: !11, isLocal: true, isDefinition: true)
|
||||
!26 = !{i32 2, !"CodeView", i32 1}
|
||||
!27 = !{i32 2, !"Debug Info Version", i32 3}
|
||||
!28 = !{i32 1, !"wchar_size", i32 2}
|
||||
!29 = !{i32 7, !"PIC Level", i32 2}
|
||||
!30 = !{!"clang version 12.0.0 (https://github.com/llvm/llvm-project.git 34cd06a9b3bddaa7a989c606bbf1327ee651711c)"}
|
||||
!31 = distinct !DISubprogram(name: "foo", linkageName: "?foo@@YAXXZ", scope: !1, file: !1, line: 15, type: !32, scopeLine: 15, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !34)
|
||||
!30 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 202f144bffd0be254a829924195e1b8ebabcbb79)"}
|
||||
!31 = distinct !DISubprogram(name: "foo", linkageName: "?foo@@YAXXZ", scope: !1, file: !1, line: 13, type: !32, scopeLine: 13, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !34)
|
||||
!32 = !DISubroutineType(types: !33)
|
||||
!33 = !{null}
|
||||
!34 = !{}
|
||||
!35 = !DILocation(line: 16, scope: !31)
|
||||
!36 = !DILocation(line: 17, scope: !31)
|
||||
!37 = !DILocation(line: 18, scope: !31)
|
||||
!38 = !DILocation(line: 19, scope: !31)
|
||||
!39 = !DILocation(line: 20, scope: !31)
|
||||
!35 = !DILocation(line: 14, scope: !31)
|
||||
!36 = !DILocation(line: 15, scope: !31)
|
||||
!37 = !DILocation(line: 16, scope: !31)
|
||||
!38 = !DILocation(line: 17, scope: !31)
|
||||
!39 = !DILocation(line: 18, scope: !31)
|
||||
|
||||
@ -12,22 +12,14 @@
|
||||
; Foo f; // FIXME: only needed to force emit 'Foo'
|
||||
|
||||
; CHECK: CodeViewTypes [
|
||||
; CHECK: Array ([[ARRAY_COMPLETE:0x.*]]) {
|
||||
; CHECK-NEXT: TypeLeafKind: LF_ARRAY (0x1503)
|
||||
; CHECK-NEXT: ElementType: const char ({{.*}})
|
||||
; CHECK-NEXT: IndexType: unsigned __int64 (0x23)
|
||||
; CHECK-NEXT: SizeOf: 5
|
||||
; CHECK-NEXT: Name:
|
||||
; CHECK-NEXT: }
|
||||
; CHECK: ]
|
||||
; CHECK: Array ([[ARRAY_FWD:0x.*]]) {
|
||||
; CHECK-NEXT: TypeLeafKind: LF_ARRAY (0x1503)
|
||||
; CHECK-NEXT: ElementType: const char ({{.*}})
|
||||
; CHECK-NEXT: IndexType: unsigned __int64 (0x23)
|
||||
; CHECK-NEXT: SizeOf: 0
|
||||
; CHECK-NEXT: Name:
|
||||
; CHECK-NEXT: Name:
|
||||
; CHECK-NEXT: }
|
||||
; CHECK: FieldList (0x1004) {
|
||||
; CHECK: FieldList (0x1003) {
|
||||
; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)
|
||||
; CHECK-NEXT: StaticDataMember {
|
||||
; CHECK-NEXT: TypeLeafKind: LF_STMEMBER (0x150E)
|
||||
@ -36,6 +28,14 @@
|
||||
; CHECK-NEXT: Name: str
|
||||
; CHECK-NEXT: }
|
||||
; CHECK-NEXT: }
|
||||
; CHECK: Array ([[ARRAY_COMPLETE:0x.*]]) {
|
||||
; CHECK-NEXT: TypeLeafKind: LF_ARRAY (0x1503)
|
||||
; CHECK-NEXT: ElementType: const char ({{.*}})
|
||||
; CHECK-NEXT: IndexType: unsigned __int64 (0x23)
|
||||
; CHECK-NEXT: SizeOf: 5
|
||||
; CHECK-NEXT: Name:
|
||||
; CHECK-NEXT: }
|
||||
; CHECK: ]
|
||||
|
||||
; CHECK: GlobalData {
|
||||
; CHECK-NEXT: Kind: S_GDATA32 (0x110D)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user