teemperor updated this revision to Diff 233756. teemperor added a comment. - Removed Objective-C metadata from LLVM test. - Removed quoted attributes. - Update DebugInfoFlags.def to be compatible with D68117 <https://reviews.llvm.org/D68117> assuming probinson are applied there.
CHANGES SINCE LAST ACTION https://reviews.llvm.org/D71201/new/ https://reviews.llvm.org/D71201 Files: clang/lib/CodeGen/CGDebugInfo.cpp clang/test/CodeGenObjC/debug-info-direct-method.m llvm/include/llvm/BinaryFormat/Dwarf.def llvm/include/llvm/IR/DebugInfoFlags.def llvm/include/llvm/IR/DebugInfoMetadata.h llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp llvm/test/DebugInfo/X86/objc_direct.ll
Index: llvm/test/DebugInfo/X86/objc_direct.ll =================================================================== --- /dev/null +++ llvm/test/DebugInfo/X86/objc_direct.ll @@ -0,0 +1,114 @@ +; RUN: llc < %s -filetype=obj -o %t +; RUN: llvm-dwarfdump -v %t | FileCheck %s + +; Source code to regenerate: +; __attribute__((objc_root_class)) +; @interface Root +; - (int)direct_method __attribute__((objc_direct)); +; @end +; +; @implementation Root +; - (int)direct_method __attribute__((objc_direct)) { +; return 42; +; } +; @end +; +; clang -O0 -g -gdwarf-5 direct.m -c + +; CHECK: DW_TAG_subprogram [3] +; CHECK: DW_AT_APPLE_objc_direct +; CHECK-SAME: DW_FORM_flag_present +; CHECK: DW_TAG_formal_parameter [4] + +; ModuleID = 'direct.bc' +source_filename = "direct.m" +target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.15.0" + +%0 = type opaque +%struct._objc_cache = type opaque +%struct._class_t = type { %struct._class_t*, %struct._class_t*, %struct._objc_cache*, i8* (i8*, i8*)**, %struct._class_ro_t* } +%struct._class_ro_t = type { i32, i32, i32, i8*, i8*, %struct.__method_list_t*, %struct._objc_protocol_list*, %struct._ivar_list_t*, i8*, %struct._prop_list_t* } +%struct.__method_list_t = type { i32, i32, [0 x %struct._objc_method] } +%struct._objc_method = type { i8*, i8*, i8* } +%struct._objc_protocol_list = type { i64, [0 x %struct._protocol_t*] } +%struct._protocol_t = type { i8*, i8*, %struct._objc_protocol_list*, %struct.__method_list_t*, %struct.__method_list_t*, %struct.__method_list_t*, %struct.__method_list_t*, %struct._prop_list_t*, i32, i32, i8**, i8*, %struct._prop_list_t* } +%struct._ivar_list_t = type { i32, i32, [0 x %struct._ivar_t] } +%struct._ivar_t = type { i64*, i8*, i8*, i32, i32 } +%struct._prop_list_t = type { i32, i32, [0 x %struct._prop_t] } +%struct._prop_t = type { i8*, i8* } + +; Function Attrs: noinline optnone ssp uwtable +define hidden i32 @"\01-[Root direct_method]"(%0* %self, i8* %_cmd) !dbg !24 { +entry: + %retval = alloca i32, align 4 + %self.addr = alloca %0*, align 8 + %_cmd.addr = alloca i8*, align 8 + store %0* %self, %0** %self.addr, align 8 + call void @llvm.dbg.declare(metadata %0** %self.addr, metadata !25, metadata !DIExpression()), !dbg !27 + store i8* %_cmd, i8** %_cmd.addr, align 8 + call void @llvm.dbg.declare(metadata i8** %_cmd.addr, metadata !28, metadata !DIExpression()), !dbg !27 + %0 = load %0*, %0** %self.addr, align 8, !dbg !30 + %1 = icmp eq %0* %0, null, !dbg !30 + br i1 %1, label %objc_direct_method.self_is_nil, label %objc_direct_method.cont, !dbg !30, !prof !31 + +objc_direct_method.self_is_nil: ; preds = %entry + %2 = bitcast i32* %retval to i8*, !dbg !30 + call void @llvm.memset.p0i8.i64(i8* align 4 %2, i8 0, i64 4, i1 false), !dbg !30 + br label %return, !dbg !30 + +objc_direct_method.cont: ; preds = %entry + store i32 42, i32* %retval, align 4, !dbg !32 + br label %return, !dbg !32 + +return: ; preds = %objc_direct_method.cont, %objc_direct_method.self_is_nil + %3 = load i32, i32* %retval, align 4, !dbg !33 + ret i32 %3, !dbg !33 +} +; Function Attrs: nounwind readnone speculatable willreturn +declare void @llvm.dbg.declare(metadata, metadata, metadata) #1 +; Function Attrs: argmemonly nounwind willreturn +declare void @llvm.memset.p0i8.i64(i8* nocapture writeonly, i8, i64, i1 immarg) #2 + +attributes #0 = { noinline optnone ssp uwtable } +attributes #1 = { nounwind readnone speculatable willreturn } +attributes #2 = { argmemonly nounwind willreturn } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!14, !15, !16, !17, !18, !19, !20, !21, !22} +!llvm.ident = !{!23} + +!0 = distinct !DICompileUnit(language: DW_LANG_ObjC, file: !1, producer: "clang version 10.0.0 (https://github.com/llvm/llvm-project d6b2f33e2b6338d24cf756ba220939aecc81210d)", isOptimized: false, runtimeVersion: 2, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None) +!1 = !DIFile(filename: "direct.m", directory: "/", checksumkind: CSK_MD5, checksum: "6b49fad130344b0011fc0eef65949390") +!2 = !{} +!3 = !{!4} +!4 = !DICompositeType(tag: DW_TAG_structure_type, name: "Root", scope: !1, file: !1, line: 2, flags: DIFlagObjcClassComplete, elements: !5, runtimeLang: DW_LANG_ObjC) +!5 = !{!6} +!6 = !DISubprogram(name: "-[Root direct_method]", scope: !4, file: !1, line: 7, type: !7, scopeLine: 7, flags: DIFlagPrototyped, spFlags: DISPFlagObjCDirect, retainedNodes: !2) +!7 = !DISubroutineType(types: !8) +!8 = !{!9, !10, !11} +!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!11 = !DIDerivedType(tag: DW_TAG_typedef, name: "SEL", file: !1, baseType: !12, flags: DIFlagArtificial) +!12 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !13, size: 64) +!13 = !DICompositeType(tag: DW_TAG_structure_type, name: "objc_selector", file: !1, flags: DIFlagFwdDecl) +!14 = !{i32 1, !"Objective-C Version", i32 2} +!15 = !{i32 1, !"Objective-C Image Info Version", i32 0} +!16 = !{i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"} +!17 = !{i32 4, !"Objective-C Garbage Collection", i32 0} +!18 = !{i32 1, !"Objective-C Class Properties", i32 64} +!19 = !{i32 7, !"Dwarf Version", i32 5} +!20 = !{i32 2, !"Debug Info Version", i32 3} +!21 = !{i32 1, !"wchar_size", i32 4} +!22 = !{i32 7, !"PIC Level", i32 2} +!23 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project d6b2f33e2b6338d24cf756ba220939aecc81210d)"} +!24 = distinct !DISubprogram(name: "-[Root direct_method]", scope: !1, file: !1, line: 7, type: !7, scopeLine: 7, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, declaration: !6, retainedNodes: !2) +!25 = !DILocalVariable(name: "self", arg: 1, scope: !24, type: !26, flags: DIFlagArtificial | DIFlagObjectPointer) +!26 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64) +!27 = !DILocation(line: 0, scope: !24) +!28 = !DILocalVariable(name: "_cmd", arg: 2, scope: !24, type: !29, flags: DIFlagArtificial) +!29 = !DIDerivedType(tag: DW_TAG_typedef, name: "SEL", file: !1, baseType: !12) +!30 = !DILocation(line: 7, column: 1, scope: !24) +!31 = !{!"branch_weights", i32 1, i32 1048576} +!32 = !DILocation(line: 8, column: 3, scope: !24) +!33 = !DILocation(line: 9, column: 1, scope: !24) Index: llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp =================================================================== --- llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -1233,6 +1233,9 @@ Language == dwarf::DW_LANG_ObjC)) addFlag(SPDie, dwarf::DW_AT_prototyped); + if (SP->isObjCDirect()) + addFlag(SPDie, dwarf::DW_AT_APPLE_objc_direct); + unsigned CC = 0; DITypeRefArray Args; if (const DISubroutineType *SPTy = SP->getType()) { Index: llvm/include/llvm/IR/DebugInfoMetadata.h =================================================================== --- llvm/include/llvm/IR/DebugInfoMetadata.h +++ llvm/include/llvm/IR/DebugInfoMetadata.h @@ -1758,6 +1758,7 @@ bool isPure() const { return getSPFlags() & SPFlagPure; } bool isElemental() const { return getSPFlags() & SPFlagElemental; } bool isRecursive() const { return getSPFlags() & SPFlagRecursive; } + bool isObjCDirect() const { return getSPFlags() & SPFlagObjCDirect; } /// Check if this is deleted member function. /// Index: llvm/include/llvm/IR/DebugInfoFlags.def =================================================================== --- llvm/include/llvm/IR/DebugInfoFlags.def +++ llvm/include/llvm/IR/DebugInfoFlags.def @@ -90,11 +90,12 @@ // May also utilize this Flag in future, when adding support // for defaulted functions HANDLE_DISP_FLAG((1u << 9), Deleted) +HANDLE_DISP_FLAG((1u << 11), ObjCDirect) #ifdef DISP_FLAG_LARGEST_NEEDED // Intended to be used with ADT/BitmaskEnum.h. // NOTE: Always must be equal to largest flag, check this when adding new flags. -HANDLE_DISP_FLAG((1 << 9), Largest) +HANDLE_DISP_FLAG((1 << 11), Largest) #undef DISP_FLAG_LARGEST_NEEDED #endif Index: llvm/include/llvm/BinaryFormat/Dwarf.def =================================================================== --- llvm/include/llvm/BinaryFormat/Dwarf.def +++ llvm/include/llvm/BinaryFormat/Dwarf.def @@ -421,6 +421,7 @@ HANDLE_DW_AT(0x3feb, APPLE_property_attribute, 0, APPLE) HANDLE_DW_AT(0x3fec, APPLE_objc_complete_type, 0, APPLE) HANDLE_DW_AT(0x3fed, APPLE_property, 0, APPLE) +HANDLE_DW_AT(0x3fee, APPLE_objc_direct, 0, APPLE) // Attribute form encodings. HANDLE_DW_FORM(0x01, addr, 2, DWARF) Index: clang/test/CodeGenObjC/debug-info-direct-method.m =================================================================== --- clang/test/CodeGenObjC/debug-info-direct-method.m +++ clang/test/CodeGenObjC/debug-info-direct-method.m @@ -1,12 +1,17 @@ // RUN: %clang_cc1 -dwarf-version=5 -emit-llvm -debug-info-kind=limited -w -triple x86_64-apple-darwin10 %s -o - | FileCheck %s // RUN: %clang_cc1 -dwarf-version=4 -emit-llvm -debug-info-kind=limited -w -triple x86_64-apple-darwin10 %s -o - | FileCheck %s +// RUN: %clang_cc1 -dwarf-version=5 -emit-llvm -debug-info-kind=limited -w -triple x86_64-apple-darwin10 %s -o - -DDISABLE_DIRECT | FileCheck --check-prefix=CHECK-DISABLED %s __attribute__((objc_root_class)) @interface Root @end @implementation Root -- (int)getInt __attribute__((objc_direct)) { +- (int)getInt +#ifndef DISABLE_DIRECT + __attribute__((objc_direct)) +#endif +{ return 42; } @end @@ -19,3 +24,6 @@ // CHECK-SAME: runtimeLang: DW_LANG_ObjC) // CHECK: ![[MEMBERS]] = !{![[GETTER:[0-9]+]]} // CHECK: ![[GETTER]] = !DISubprogram(name: "-[Root getInt]", +// CHECK-SAME: spFlags: DISPFlagObjCDirect + +// CHECK-DISABLED-NOT: DISPFlagObjCDirect Index: clang/lib/CodeGen/CGDebugInfo.cpp =================================================================== --- clang/lib/CodeGen/CGDebugInfo.cpp +++ clang/lib/CodeGen/CGDebugInfo.cpp @@ -3495,6 +3495,9 @@ if (CGM.getCodeGenOpts().DwarfVersion < 5 && !OMD->isDirectMethod()) return nullptr; + if (OMD->isDirectMethod()) + SPFlags |= llvm::DISubprogram::SPFlagObjCDirect; + // Starting with DWARF V5 method declarations are emitted as children of // the interface type. auto *ID = dyn_cast_or_null<ObjCInterfaceDecl>(D->getDeclContext());
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits