From 791e629deef7e4a410e67527da26405916415d3a Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Sat, 19 May 2012 01:36:37 +0000 Subject: [PATCH] Actually support DW_TAG_rvalue_reference_type that we were trying to generate out of the front end. rdar://11479676 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157094 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Analysis/DIBuilder.h | 4 ++-- lib/Analysis/DIBuilder.cpp | 7 +++--- lib/Analysis/DebugInfo.cpp | 16 ++++++++----- test/DebugInfo/X86/rvalue-ref.ll | 40 +++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 test/DebugInfo/X86/rvalue-ref.ll diff --git a/include/llvm/Analysis/DIBuilder.h b/include/llvm/Analysis/DIBuilder.h index d79c2d5c2a4..434d98ba4e7 100644 --- a/include/llvm/Analysis/DIBuilder.h +++ b/include/llvm/Analysis/DIBuilder.h @@ -127,8 +127,8 @@ namespace llvm { StringRef Name = StringRef()); /// createReferenceType - Create debugging information entry for a c++ - /// style reference. - DIType createReferenceType(DIType RTy); + /// style reference or rvalue reference type. + DIType createReferenceType(unsigned Tag, DIType RTy); /// createTypedef - Create debugging information entry for a typedef. /// @param Ty Original type. diff --git a/lib/Analysis/DIBuilder.cpp b/lib/Analysis/DIBuilder.cpp index d9828331d7a..0e7d5401003 100644 --- a/lib/Analysis/DIBuilder.cpp +++ b/lib/Analysis/DIBuilder.cpp @@ -229,12 +229,13 @@ DIType DIBuilder::createPointerType(DIType PointeeTy, uint64_t SizeInBits, return DIType(MDNode::get(VMContext, Elts)); } -/// createReferenceType - Create debugging information entry for a reference. -DIType DIBuilder::createReferenceType(DIType RTy) { +/// createReferenceType - Create debugging information entry for a reference +/// type. +DIType DIBuilder::createReferenceType(unsigned Tag, DIType RTy) { assert(RTy.Verify() && "Unable to create reference type"); // References are encoded in DIDerivedType format. Value *Elts[] = { - GetTagConstant(VMContext, dwarf::DW_TAG_reference_type), + GetTagConstant(VMContext, Tag), NULL, // TheCU, NULL, // Name NULL, // Filename diff --git a/lib/Analysis/DebugInfo.cpp b/lib/Analysis/DebugInfo.cpp index f61a8f3a5eb..194aed8b9f6 100644 --- a/lib/Analysis/DebugInfo.cpp +++ b/lib/Analysis/DebugInfo.cpp @@ -150,6 +150,7 @@ bool DIDescriptor::isDerivedType() const { case dwarf::DW_TAG_typedef: case dwarf::DW_TAG_pointer_type: case dwarf::DW_TAG_reference_type: + case dwarf::DW_TAG_rvalue_reference_type: case dwarf::DW_TAG_const_type: case dwarf::DW_TAG_volatile_type: case dwarf::DW_TAG_restrict_type: @@ -399,11 +400,13 @@ bool DIType::Verify() const { unsigned Tag = getTag(); if (!isBasicType() && Tag != dwarf::DW_TAG_const_type && Tag != dwarf::DW_TAG_volatile_type && Tag != dwarf::DW_TAG_pointer_type && - Tag != dwarf::DW_TAG_reference_type && Tag != dwarf::DW_TAG_restrict_type - && Tag != dwarf::DW_TAG_vector_type && Tag != dwarf::DW_TAG_array_type - && Tag != dwarf::DW_TAG_enumeration_type - && Tag != dwarf::DW_TAG_subroutine_type - && getFilename().empty()) + Tag != dwarf::DW_TAG_reference_type && + Tag != dwarf::DW_TAG_rvalue_reference_type && + Tag != dwarf::DW_TAG_restrict_type && Tag != dwarf::DW_TAG_vector_type && + Tag != dwarf::DW_TAG_array_type && + Tag != dwarf::DW_TAG_enumeration_type && + Tag != dwarf::DW_TAG_subroutine_type && + getFilename().empty()) return false; return true; } @@ -512,7 +515,8 @@ uint64_t DIDerivedType::getOriginalTypeSize() const { // it's a reference then it's just the size of the field. Pointer types // have no need of this since they're a different type of qualification // on the type. - if (BaseType.getTag() == dwarf::DW_TAG_reference_type) + if (BaseType.getTag() == dwarf::DW_TAG_reference_type || + BaseType.getTag() == dwarf::DW_TAG_rvalue_reference_type) return getSizeInBits(); else if (BaseType.isDerivedType()) return DIDerivedType(BaseType).getOriginalTypeSize(); diff --git a/test/DebugInfo/X86/rvalue-ref.ll b/test/DebugInfo/X86/rvalue-ref.ll new file mode 100644 index 00000000000..e73869dbe07 --- /dev/null +++ b/test/DebugInfo/X86/rvalue-ref.ll @@ -0,0 +1,40 @@ +; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj -O0 +; RUN: llvm-dwarfdump %t | FileCheck %s + +; CHECK: DW_TAG_rvalue_reference_type + +@.str = private unnamed_addr constant [4 x i8] c"%d\0A\00", align 1 + +define void @_Z3fooOi(i32* %i) uwtable ssp { +entry: + %i.addr = alloca i32*, align 8 + store i32* %i, i32** %i.addr, align 8 + call void @llvm.dbg.declare(metadata !{i32** %i.addr}, metadata !11), !dbg !12 + %0 = load i32** %i.addr, align 8, !dbg !13 + %1 = load i32* %0, align 4, !dbg !13 + %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8]* @.str, i32 0, i32 0), i32 %1), !dbg !13 + ret void, !dbg !15 +} + +declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone + +declare i32 @printf(i8*, ...) + +!llvm.dbg.cu = !{!0} + +!0 = metadata !{i32 786449, i32 0, i32 4, metadata !"foo.cpp", metadata !"/Users/echristo/tmp", metadata !"clang version 3.2 (trunk 157054) (llvm/trunk 157060)", i1 true, i1 false, metadata !"", i32 0, metadata !1, metadata !1, metadata !3, metadata !1} ; [ DW_TAG_compile_unit ] +!1 = metadata !{metadata !2} +!2 = metadata !{i32 0} +!3 = metadata !{metadata !4} +!4 = metadata !{metadata !5} +!5 = metadata !{i32 786478, i32 0, metadata !6, metadata !"foo", metadata !"foo", metadata !"_Z3fooOi", metadata !6, i32 4, metadata !7, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (i32*)* @_Z3fooOi, null, null, metadata !1, i32 5} ; [ DW_TAG_subprogram ] +!6 = metadata !{i32 786473, metadata !"foo.cpp", metadata !"/Users/echristo/tmp", null} ; [ DW_TAG_file_type ] +!7 = metadata !{i32 786453, i32 0, metadata !"", i32 0, i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] +!8 = metadata !{null, metadata !9} +!9 = metadata !{i32 786498, null, null, null, i32 0, i64 0, i64 0, i64 0, i32 0, metadata !10} ; [ DW_TAG_rvalue_reference_type ] +!10 = metadata !{i32 786468, null, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] +!11 = metadata !{i32 786689, metadata !5, metadata !"i", metadata !6, i32 16777220, metadata !9, i32 0, i32 0} ; [ DW_TAG_arg_variable ] +!12 = metadata !{i32 4, i32 17, metadata !5, null} +!13 = metadata !{i32 6, i32 3, metadata !14, null} +!14 = metadata !{i32 786443, metadata !5, i32 5, i32 1, metadata !6, i32 0} ; [ DW_TAG_lexical_block ] +!15 = metadata !{i32 7, i32 1, metadata !14, null}