RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 20:23:11 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[DWARF5]Addition of alignment atrribute in typedef DIE."

Browse Source 
This reverts commit 423f541c1a322963cf482683fe9777ef0692082d, which
breaks llvm-c ABI.
This commit is contained in:
Sam McCall 2019-11-18 15:53:22 +01:00
parent 3020ce49f1
commit 7131c18f0e
7 changed files with 9 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm-c/DebugInfo.h
View File

@ -875,7 +875,7 @@ LLVMMetadataRef
LLVMDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type,
const char *Name, size_t NameLen,
LLVMMetadataRef File, unsigned LineNo,
LLVMMetadataRef Scope, uint32_t AlignInBits);
LLVMMetadataRef Scope);
/**
* Create debugging information entry to establish inheritance relationship

4
include/llvm/IR/DIBuilder.h
View File

@ -237,10 +237,8 @@ namespace llvm {
/// \param File File where this type is defined.
/// \param LineNo Line number.
/// \param Context The surrounding context for the typedef.
/// \param AlignInBits Alignment. (Optional)
DIDerivedType *createTypedef(DIType *Ty, StringRef Name, DIFile *File,
unsigned LineNo, DIScope *Context,
Optional<unsigned> AlignInBits = {});
unsigned LineNo, DIScope *Context);
/// Create debugging information entry for a 'friend'.
DIDerivedType *createFriend(DIType *Ty, DIType *FriendTy);

9
lib/CodeGen/AsmPrinter/DwarfUnit.cpp
View File

@ -800,15 +800,6 @@ void DwarfUnit::constructTypeDIE(DIE &Buffer, const DIDerivedType *DTy) {
if (!Name.empty())
addString(Buffer, dwarf::DW_AT_name, Name);
// If alignment is specified for a typedef , create and insert DW_AT_alignment
// attribute in DW_TAG_typedef DIE.
if (Tag == dwarf::DW_TAG_typedef && DD->getDwarfVersion() >= 5) {
uint32_t AlignInBytes = DTy->getAlignInBytes();
if (AlignInBytes > 0)
addUInt(Buffer, dwarf::DW_AT_alignment, dwarf::DW_FORM_udata,
AlignInBytes);
}
// Add size if non-zero (derived types might be zero-sized.)
if (Size && Tag != dwarf::DW_TAG_pointer_type
&& Tag != dwarf::DW_TAG_ptr_to_member_type

6
lib/IR/DIBuilder.cpp
View File

@ -306,11 +306,9 @@ DIDerivedType *DIBuilder::createReferenceType(
DIDerivedType *DIBuilder::createTypedef(DIType *Ty, StringRef Name,
DIFile *File, unsigned LineNo,
DIScope *Context,
Optional<unsigned> AlignInBits) {
DIScope *Context) {
return DIDerivedType::get(VMContext, dwarf::DW_TAG_typedef, Name, File,
LineNo, getNonCompileUnitScope(Context), Ty, 0,
AlignInBits.hasValue() ? AlignInBits.getValue() : 0,
LineNo, getNonCompileUnitScope(Context), Ty, 0, 0,
0, None, DINode::FlagZero);
}

7
lib/IR/DebugInfo.cpp
View File

@ -1108,10 +1108,11 @@ LLVMMetadataRef
LLVMDIBuilderCreateTypedef(LLVMDIBuilderRef Builder, LLVMMetadataRef Type,
const char *Name, size_t NameLen,
LLVMMetadataRef File, unsigned LineNo,
LLVMMetadataRef Scope, uint32_t AlignInBits) {
LLVMMetadataRef Scope) {
return wrap(unwrap(Builder)->createTypedef(
unwrapDI<DIType>(Type), {Name, NameLen}, unwrapDI<DIFile>(File), LineNo,
unwrapDI<DIScope>(Scope), AlignInBits));
unwrapDI<DIType>(Type), {Name, NameLen},
unwrapDI<DIFile>(File), LineNo,
unwrapDI<DIScope>(Scope)));
}
LLVMMetadataRef

63
test/DebugInfo/X86/debug-info-template-align.ll
View File

@ -1,63 +0,0 @@
; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump -v - | FileCheck %s
; C++ source to regenerate:
;typedef char __attribute__((__aligned__(64))) alchar;
;int main(){
; alchar newChar;
;}
; $ clang++ -O0 -g -gdwarf-5 debug-info-template-align.cpp -c
; CHECK: .debug_abbrev contents:
; CHECK: [5] DW_TAG_typedef DW_CHILDREN_no
; CHECK: DW_AT_alignment DW_FORM_udata
; CHECK: .debug_info contents:
;CHECK: DW_TAG_typedef [5]
;CHECK: DW_AT_name {{.*}} "alchar"
;CHECK-NEXT: DW_AT_alignment [DW_FORM_udata] (64)
; ModuleID = '/dir/test.cpp'
source_filename = "/dir/test.cpp"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; Function Attrs: noinline norecurse nounwind optnone uwtable
define dso_local i32 @main() #0 !dbg !7 {
entry:
%newChar = alloca i8, align 64
call void @llvm.dbg.declare(metadata i8* %newChar, metadata !12, metadata !DIExpression()), !dbg !15
ret i32 0, !dbg !16
}
; Function Attrs: nounwind readnone speculatable willreturn
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
attributes #0 = { noinline norecurse nounwind optnone uwtable }
attributes #1 = { nounwind readnone speculatable willreturn }
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3, !4, !5}
!llvm.ident = !{!6}
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 10.0.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
!1 = !DIFile(filename: "/dir/test.cpp", directory: "/home/awpandey/tools/llvm/test/DebugInfo", checksumkind: CSK_MD5, checksum: "872e252efdfcb9480b4bfaf8437f58ab")
!2 = !{}
!3 = !{i32 2, !"Dwarf Version", i32 5}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 4}
!6 = !{!"clang version 10.0.0 "}
!7 = distinct !DISubprogram(name: "main", scope: !8, file: !8, line: 12, type: !9, scopeLine: 12, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
!8 = !DIFile(filename: "test.cpp", directory: "/dir", checksumkind: CSK_MD5, checksum: "872e252efdfcb9480b4bfaf8437f58ab")
!9 = !DISubroutineType(types: !10)
!10 = !{!11}
!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!12 = !DILocalVariable(name: "newChar", scope: !7, file: !8, line: 13, type: !13)
!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "alchar", file: !8, line: 10, baseType: !14, align: 512)
!14 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
!15 = !DILocation(line: 13, column: 10, scope: !7)
!16 = !DILocation(line: 14, column: 1, scope: !7)

2
tools/llvm-c-test/debuginfo.c
View File

@ -69,7 +69,7 @@ int llvm_test_dibuilder(void) {
LLVMMetadataRef Int64Ty =
LLVMDIBuilderCreateBasicType(DIB, "Int64", 5, 64, 0, LLVMDIFlagZero);
LLVMMetadataRef Int64TypeDef =
LLVMDIBuilderCreateTypedef(DIB, Int64Ty, "int64_t", 7, File, 42, File, 0);
LLVMDIBuilderCreateTypedef(DIB, Int64Ty, "int64_t", 7, File, 42, File);
LLVMMetadataRef GlobalVarValueExpr =
LLVMDIBuilderCreateConstantValueExpression(DIB, 0);