Index: llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.h =================================================================== --- llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.h +++ llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.h @@ -94,6 +94,7 @@ struct LocalVariable { const DILocalVariable *DIVar = nullptr; SmallVector DefRanges; + bool Deref; }; struct InlineSite { @@ -259,6 +260,8 @@ codeview::TypeIndex getTypeIndex(DITypeRef TypeRef, DITypeRef ClassTyRef = DITypeRef()); + codeview::TypeIndex getTypeIndexForReferenceTo(DITypeRef TypeRef); + codeview::TypeIndex getMemberFunctionType(const DISubprogram *SP, const DICompositeType *Class); Index: llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp =================================================================== --- llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp +++ llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp @@ -945,6 +945,7 @@ LocalVariable Var; Var.DIVar = VI.Var; Var.DefRanges.emplace_back(std::move(DefRange)); + Var.Deref = false; recordLocalVariable(std::move(Var), VI.Loc->getInlinedAt()); } } @@ -979,6 +980,16 @@ Var.DIVar = DIVar; // Calculate the definition ranges. + // Because we cannot express DW_OP_deref in CodeView directly, + // we use a trick: we encode the type as a reference to the + // real type. Unfortunately, this means we cannot mix deref + // defranges with non-deref defranges. We track how much of + // the code is covered by each, and use the variant which + // gives us the most coverage. + uint64_t DerefLength = 0; + uint64_t NonDerefLength = 0; + SmallVector DerefDefRanges; + SmallVector NonDerefDefRanges; for (auto I = Ranges.begin(), E = Ranges.end(); I != E; ++I) { const InsnRange &Range = *I; const MachineInstr *DVInst = Range.first; @@ -987,27 +998,55 @@ bool InMemory = DVInst->getOperand(1).isImm(); bool IsSubfield = false; unsigned StructOffset = 0; - // Recognize a +Offset expression. + Optional Fragment; + // Read DIExpr to get the offset (if any). + // We only handle expressions generated by DIExpression::appendOffset, + // which doesn't require a full stack machine. int Offset = 0; - DIExpressionCursor Ops(DIExpr); - auto Op = Ops.peek(); - if (Op && Op->getOp() == dwarf::DW_OP_plus_uconst) { - Offset = Op->getArg(0); - Ops.take(); + bool Supported = true; + bool Deref = false; + auto Op = DIExpr->expr_op_begin(); + while (Supported && Op != DIExpr->expr_op_end()) { + switch (Op->getOp()) { + case dwarf::DW_OP_constu: { + int Value = Op->getArg(0); + ++Op; + if (Op != DIExpr->expr_op_end()) { + switch (Op->getOp()) { + case dwarf::DW_OP_minus: + Offset -= Value; + break; + case dwarf::DW_OP_plus: + Offset += Value; + default: + continue; + } + } + } break; + case dwarf::DW_OP_plus_uconst: + Offset += Op->getArg(0); + break; + case dwarf::DW_OP_LLVM_fragment: + Fragment = {Op->getArg(1), Op->getArg(0)}; + break; + case dwarf::DW_OP_deref: + Deref = true; + break; + default: + Supported = false; + } + ++Op; } + // If we don't know how to handle this range, skip past it. + if (!Supported || (Offset && !InMemory)) + continue; + // Handle fragments. - auto Fragment = Ops.getFragmentInfo(); if (Fragment) { IsSubfield = true; StructOffset = Fragment->OffsetInBits / 8; } - // Ignore unrecognized exprs. - if (Ops.peek() && Ops.peek()->getOp() != dwarf::DW_OP_LLVM_fragment) - continue; - if (!InMemory && Offset) - continue; - // Bail if operand 0 is not a valid register. This means the variable is a // simple constant, or is described by a complex expression. // FIXME: Find a way to represent constant variables, since they are @@ -1017,6 +1056,10 @@ if (Reg == 0) continue; + SmallVector &DefRanges = + Deref ? DerefDefRanges : NonDerefDefRanges; + uint64_t &Length = Deref ? DerefLength : NonDerefLength; + // Handle the two cases we can handle: indirect in memory and in register. unsigned CVReg = TRI->getCodeViewRegNum(Reg); { @@ -1027,9 +1070,8 @@ DR.IsSubfield = IsSubfield; DR.StructOffset = StructOffset; - if (Var.DefRanges.empty() || - Var.DefRanges.back().isDifferentLocation(DR)) { - Var.DefRanges.emplace_back(std::move(DR)); + if (DefRanges.empty() || DefRanges.back().isDifferentLocation(DR)) { + DefRanges.emplace_back(std::move(DR)); } } @@ -1048,11 +1090,13 @@ else End = Asm->getFunctionEnd(); } + assert(End); + Length += End->getOffset() - Begin->getOffset(); // If the last range end is our begin, just extend the last range. // Otherwise make a new range. SmallVectorImpl> &Ranges = - Var.DefRanges.back().Ranges; + DefRanges.back().Ranges; if (!Ranges.empty() && Ranges.back().second == Begin) Ranges.back().second = End; else @@ -1061,6 +1105,14 @@ // FIXME: Do more range combining. } + if (DerefLength > NonDerefLength) { + Var.Deref = true; + Var.DefRanges = std::move(DerefDefRanges); + } else { + Var.Deref = false; + Var.DefRanges = std::move(NonDerefDefRanges); + } + recordLocalVariable(std::move(Var), InlinedAt); } } @@ -1971,6 +2023,16 @@ return recordTypeIndexForDINode(Ty, TI, ClassTy); } +TypeIndex CodeViewDebug::getTypeIndexForReferenceTo(DITypeRef TypeRef) { + DIType *Ty = TypeRef.resolve(); + PointerRecord PR(getTypeIndex(Ty), + getPointerSizeInBytes() == 8 ? PointerKind::Near64 + : PointerKind::Near32, + PointerMode::LValueReference, PointerOptions::None, + Ty->getSizeInBits() / 8); + return TypeTable.writeKnownType(PR); +} + TypeIndex CodeViewDebug::getCompleteTypeIndex(DITypeRef TypeRef) { const DIType *Ty = TypeRef.resolve(); @@ -2078,7 +2140,8 @@ Flags |= LocalSymFlags::IsOptimizedOut; OS.AddComment("TypeIndex"); - TypeIndex TI = getCompleteTypeIndex(Var.DIVar->getType()); + TypeIndex TI = Var.Deref ? getTypeIndexForReferenceTo(Var.DIVar->getType()) + : getCompleteTypeIndex(Var.DIVar->getType()); OS.EmitIntValue(TI.getIndex(), 4); OS.AddComment("Flags"); OS.EmitIntValue(static_cast(Flags), 2); Index: llvm/test/CodeGen/MIR/X86/diexpr-win32.mir =================================================================== --- /dev/null +++ llvm/test/CodeGen/MIR/X86/diexpr-win32.mir @@ -0,0 +1,254 @@ +# RUN: llc -filetype=obj -O0 %s -o - | llvm-readobj -codeview | FileCheck %s +# +# (DW_OP_plus_uconst 12) +# CHECK: LocalSym { +# CHECK-NEXT: Kind: S_LOCAL (0x113E) +# CHECK-NEXT: Type: string* (0x +# CHECK-NEXT: Flags [ (0x0) +# CHECK-NEXT: ] +# CHECK-NEXT: VarName: Str +# CHECK-NEXT: } +# CHECK-NEXT: DefRangeRegisterRelSym { +# CHECK-NEXT: Kind: S_DEFRANGE_REGISTER_REL (0x1145) +# CHECK-NEXT: BaseRegister: +# CHECK-NEXT: HasSpilledUDTMember: No +# CHECK-NEXT: OffsetInParent: 0 +# CHECK-NEXT: BasePointerOffset: 12 +# CHECK-NEXT: LocalVariableAddrRange { +# CHECK-NEXT: OffsetStart: +# CHECK-NEXT: ISectStart: +# CHECK-NEXT: Range: +# CHECK-NEXT: } +# CHECK-NEXT: } +# (DW_OP_plus_uconst, 8, DW_OP_deref) +# CHECK: LocalSym { +# CHECK-NEXT: Kind: S_LOCAL (0x113E) +# CHECK-NEXT: Type: string& (0x +# CHECK-NEXT: Flags [ (0x0) +# CHECK-NEXT: ] +# CHECK-NEXT: VarName: Result +# CHECK-NEXT: } +# CHECK-NEXT: DefRangeRegisterRelSym { +# CHECK-NEXT: Kind: S_DEFRANGE_REGISTER_REL (0x1145) +# CHECK-NEXT: BaseRegister: +# CHECK-NEXT: HasSpilledUDTMember: No +# CHECK-NEXT: OffsetInParent: 0 +# CHECK-NEXT: BasePointerOffset: 8 +# CHECK-NEXT: LocalVariableAddrRange { +# CHECK-NEXT: OffsetStart: +# CHECK-NEXT: ISectStart: +# CHECK-NEXT: Range: +# CHECK-NEXT: } +# CHECK-NEXT: } +# (DW_OP_constu, 4, DW_OP_minus) +# CHECK: LocalSym { +# CHECK-NEXT: Kind: S_LOCAL (0x113E) +# CHECK-NEXT: Type: long (0x12) +# CHECK-NEXT: Flags [ (0x0) +# CHECK-NEXT: ] +# CHECK-NEXT: VarName: Bytes +# CHECK-NEXT: } +# CHECK-NEXT: DefRangeRegisterRelSym { +# CHECK-NEXT: Kind: S_DEFRANGE_REGISTER_REL (0x1145) +# CHECK-NEXT: BaseRegister: +# CHECK-NEXT: HasSpilledUDTMember: No +# CHECK-NEXT: OffsetInParent: 0 +# CHECK-NEXT: BasePointerOffset: -4 +# CHECK-NEXT: LocalVariableAddrRange { +# CHECK-NEXT: OffsetStart: +# CHECK-NEXT: ISectStart: +# CHECK-NEXT: Range: +# CHECK-NEXT: } +# CHECK-NEXT: } +--- | + ; ModuleID = '' + source_filename = "" + target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" + target triple = "i386-pc-windows-msvc19.0.24215" + + %struct.string = type { i32, i32, i8* } + + define void @fun(%struct.string* noalias sret %agg.result, %struct.string* noalias %str) !dbg !12 { + entry: + call void @llvm.dbg.value(metadata %struct.string* %agg.result, metadata !23, metadata !24), !dbg !25 + call void @llvm.dbg.value(metadata %struct.string* %str, metadata !26, metadata !28), !dbg !25 + %call = call dereferenceable(12) %struct.string* @getString(), !dbg !29 + %0 = bitcast %struct.string* %agg.result to i8*, !dbg !29 + %1 = bitcast %struct.string* %call to i8*, !dbg !29 + call void @llvm.memcpy.p0i8.p0i8.i32(i8* %0, i8* %1, i32 12, i32 4, i1 false), !dbg !29 + ret void, !dbg !30 + } + + define i32 @len(%struct.string* %s, i32 %acc) !dbg !31 { + entry: + %0 = bitcast %struct.string* %s to i32* + %bytes = load i32, i32* %0, !dbg !34 + call void @llvm.dbg.declare(metadata i32 %bytes, metadata !35, metadata !28), !dbg !34 + %1 = add i32 %bytes, %acc, !dbg !36 + ret i32 %1, !dbg !36 + } + + ; Function Attrs: nounwind readnone speculatable + declare void @llvm.dbg.declare(metadata, metadata, metadata) #0 + + ; Function Attrs: nounwind readnone speculatable + declare void @llvm.dbg.value(metadata, metadata, metadata) #0 + + declare dereferenceable(12) %struct.string* @getString() + + ; Function Attrs: argmemonly nounwind + declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture readonly, i32, i32, i1) #1 + + ; Function Attrs: nounwind + declare void @llvm.stackprotector(i8*, i8**) #2 + + attributes #0 = { nounwind readnone speculatable } + attributes #1 = { argmemonly nounwind } + attributes #2 = { nounwind } + + !llvm.dbg.cu = !{!0} + !llvm.linker.options = !{!3, !4} + !llvm.module.flags = !{!5, !6, !7, !8} + !llvm.ident = !{!9} + !llvm.dbg.mir = !{!10, !11} + + !0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 6.0.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2) + !1 = !DIFile(filename: "diexpr.ll", directory: "C:\5Csrc", checksumkind: CSK_MD5, checksum: "c547c362c610fa79e7abaddc76e1efe7") + !2 = !{} + !3 = !{!"/DEFAULTLIB:libcmt.lib"} + !4 = !{!"/DEFAULTLIB:oldnames.lib"} + !5 = !{i32 1, !"NumRegisterParameters", i32 0} + !6 = !{i32 2, !"CodeView", i32 1} + !7 = !{i32 2, !"Debug Info Version", i32 3} + !8 = !{i32 1, !"wchar_size", i32 2} + !9 = !{!"clang version 6.0.0 "} + !10 = !DIExpression(DW_OP_plus_uconst, 12) + !11 = !DIExpression(DW_OP_plus_uconst, 8, DW_OP_deref) + !12 = distinct !DISubprogram(name: "fun", linkageName: "fun", scope: !1, file: !1, line: 9, type: !13, isLocal: false, isDefinition: true, scopeLine: 9, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2) + !13 = !DISubroutineType(types: !14) + !14 = !{!15} + !15 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "string", file: !1, line: 1, size: 96, elements: !16, identifier: ".?AUstring@@") + !16 = !{!17, !19, !20} + !17 = !DIDerivedType(tag: DW_TAG_member, name: "length", scope: !15, file: !1, line: 2, baseType: !18, size: 32) + !18 = !DIBasicType(name: "long int", size: 32, encoding: DW_ATE_signed) + !19 = !DIDerivedType(tag: DW_TAG_member, name: "size", scope: !15, file: !1, line: 3, baseType: !18, size: 32, offset: 32) + !20 = !DIDerivedType(tag: DW_TAG_member, name: "data", scope: !15, file: !1, line: 4, baseType: !21, size: 32, offset: 64) + !21 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !22, size: 32) + !22 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char) + !23 = !DILocalVariable(name: "Result", scope: !12, file: !1, line: 10, type: !15) + !24 = !DIExpression(DW_OP_deref) + !25 = !DILocation(line: 10, scope: !12) + !26 = !DILocalVariable(name: "Str", scope: !12, file: !1, line: 10, type: !27) + !27 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 32) + !28 = !DIExpression(DW_OP_constu, 4, DW_OP_minus) + !29 = !DILocation(line: 11, scope: !12) + !30 = !DILocation(line: 12, scope: !12) + !31 = distinct !DISubprogram(name: "len", linkageName: "len", scope: !1, file: !1, line: 14, type: !32, isLocal: false, isDefinition: true, scopeLine: 14, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2) + !32 = !DISubroutineType(types: !33) + !33 = !{!18} + !34 = !DILocation(line: 15, scope: !31) + !35 = !DILocalVariable(name: "Bytes", scope: !31, file: !1, line: 15, type: !18) + !36 = !DILocation(line: 16, scope: !31) + +... +--- +name: fun +alignment: 4 +exposesReturnsTwice: false +legalized: false +regBankSelected: false +selected: false +tracksRegLiveness: true +registers: +liveins: +frameInfo: + isFrameAddressTaken: false + isReturnAddressTaken: false + hasStackMap: false + hasPatchPoint: false + stackSize: 4 + offsetAdjustment: 0 + maxAlignment: 4 + adjustsStack: true + hasCalls: true + stackProtector: '' + maxCallFrameSize: 0 + hasOpaqueSPAdjustment: false + hasVAStart: false + hasMustTailInVarArgFunc: false + savePoint: '' + restorePoint: '' +fixedStack: + - { id: 0, type: spill-slot, offset: -8, size: 4, alignment: 4, stack-id: 0, + callee-saved-register: '%esi' } + - { id: 1, type: default, offset: 4, size: 4, alignment: 4, stack-id: 0, + isImmutable: true, isAliased: false, callee-saved-register: '' } + - { id: 2, type: default, offset: 0, size: 4, alignment: 4, stack-id: 0, + isImmutable: true, isAliased: false, callee-saved-register: '' } +stack: +constants: +body: | + bb.0.entry: + liveins: %esi + + frame-setup PUSH32r killed %esi, implicit-def %esp, implicit %esp + CFI_INSTRUCTION def_cfa_offset 8 + CFI_INSTRUCTION offset %esi, -8 + %esi = MOV32rm %esp, 1, _, 8, _ :: (load 4 from %fixed-stack.2) + DBG_VALUE %esp, 0, !26, !10, debug-location !25 + DBG_VALUE %esp, 0, !23, !11, debug-location !25 + CALLpcrel32 @getString, csr_32, implicit %esp, implicit-def %esp, implicit-def %eax, debug-location !29 + %ecx = MOV32rm %eax, 1, _, 0, _, debug-location !29 :: (dereferenceable load 4 from %ir.1) + %edx = MOV32rm %eax, 1, _, 4, _, debug-location !29 :: (dereferenceable load 4 from %ir.1 + 4) + MOV32mr %esi, 1, _, 0, _, killed %ecx, debug-location !29 :: (store 4 into %ir.0) + MOV32mr %esi, 1, _, 4, _, killed %edx, debug-location !29 :: (store 4 into %ir.0 + 4) + %eax = MOV32rm killed %eax, 1, _, 8, _, debug-location !29 :: (dereferenceable load 4 from %ir.1 + 8) + MOV32mr %esi, 1, _, 8, _, killed %eax, debug-location !29 :: (store 4 into %ir.0 + 8) + %eax = COPY killed %esi, debug-location !30 + %esi = POP32r implicit-def %esp, implicit %esp, debug-location !30 + RET 0, %eax, debug-location !30 + +... +--- +name: len +alignment: 4 +exposesReturnsTwice: false +legalized: false +regBankSelected: false +selected: false +tracksRegLiveness: true +registers: +liveins: +frameInfo: + isFrameAddressTaken: false + isReturnAddressTaken: false + hasStackMap: false + hasPatchPoint: false + stackSize: 0 + offsetAdjustment: 0 + maxAlignment: 4 + adjustsStack: false + hasCalls: false + stackProtector: '' + maxCallFrameSize: 0 + hasOpaqueSPAdjustment: false + hasVAStart: false + hasMustTailInVarArgFunc: false + savePoint: '' + restorePoint: '' +fixedStack: + - { id: 0, type: default, offset: 4, size: 4, alignment: 4, stack-id: 0, + isImmutable: true, isAliased: false, callee-saved-register: '' } + - { id: 1, type: default, offset: 0, size: 4, alignment: 4, stack-id: 0, + isImmutable: true, isAliased: false, callee-saved-register: '' } +stack: +constants: +body: | + bb.0.entry: + %eax = MOV32rm %esp, 1, _, 4, _ :: (load 4 from %fixed-stack.1) + %eax = MOV32rm killed %eax, 1, _, 0, _, debug-location !34 :: (load 4 from %ir.0) + DBG_VALUE debug-use %eax, 0, !35, !28, debug-location !34 + %eax = ADD32rm killed %eax, %esp, 1, _, 8, _, implicit-def dead %eflags, debug-location !36 :: (load 4 from %fixed-stack.0) + RET 0, %eax, debug-location !36 + +...