[llvm] d27a16e - Revert "[DWARF5]Addition of alignment atrribute in typedef DIE."
Sam McCall via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 18 06:53:54 PST 2019
Author: Sam McCall
Date: 2019-11-18T15:53:22+01:00
New Revision: d27a16eb392f39f9ee04ff5194b1eff3e189e6f8
URL: https://github.com/llvm/llvm-project/commit/d27a16eb392f39f9ee04ff5194b1eff3e189e6f8
DIFF: https://github.com/llvm/llvm-project/commit/d27a16eb392f39f9ee04ff5194b1eff3e189e6f8.diff
LOG: Revert "[DWARF5]Addition of alignment atrribute in typedef DIE."
This reverts commit 423f541c1a322963cf482683fe9777ef0692082d, which
breaks llvm-c ABI.
Added:
Modified:
clang/lib/CodeGen/CGDebugInfo.cpp
llvm/include/llvm-c/DebugInfo.h
llvm/include/llvm/IR/DIBuilder.h
llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
llvm/lib/IR/DIBuilder.cpp
llvm/lib/IR/DebugInfo.cpp
llvm/tools/llvm-c-test/debuginfo.c
Removed:
clang/test/CodeGenCXX/debug-info-template-align.cpp
llvm/test/DebugInfo/X86/debug-info-template-align.ll
################################################################################
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index f204b9716926..75c4b2ae2339 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1127,8 +1127,7 @@ llvm::DIType *CGDebugInfo::CreateType(const TemplateSpecializationType *Ty,
SourceLocation Loc = AliasDecl->getLocation();
return DBuilder.createTypedef(Src, OS.str(), getOrCreateFile(Loc),
getLineNumber(Loc),
- getDeclContextDescriptor(AliasDecl),
- /* Alignment */ None);
+ getDeclContextDescriptor(AliasDecl));
}
llvm::DIType *CGDebugInfo::CreateType(const TypedefType *Ty,
@@ -1144,10 +1143,9 @@ llvm::DIType *CGDebugInfo::CreateType(const TypedefType *Ty,
SourceLocation Loc = Ty->getDecl()->getLocation();
// Typedefs are derived from some other type.
- return DBuilder.createTypedef(
- Underlying, Ty->getDecl()->getName(), getOrCreateFile(Loc),
- getLineNumber(Loc), getDeclContextDescriptor(Ty->getDecl()),
- getDeclAlignIfRequired(Ty->getDecl(), CGM.getContext()));
+ return DBuilder.createTypedef(Underlying, Ty->getDecl()->getName(),
+ getOrCreateFile(Loc), getLineNumber(Loc),
+ getDeclContextDescriptor(Ty->getDecl()));
}
static unsigned getDwarfCC(CallingConv CC) {
@@ -2326,8 +2324,7 @@ llvm::DIType *CGDebugInfo::CreateType(const ObjCTypeParamType *Ty,
return DBuilder.createTypedef(
getOrCreateType(Ty->getDecl()->getUnderlyingType(), Unit),
Ty->getDecl()->getName(), getOrCreateFile(Loc), getLineNumber(Loc),
- getDeclContextDescriptor(Ty->getDecl()),
- /* Alignment */ None);
+ getDeclContextDescriptor(Ty->getDecl()));
}
/// \return true if Getter has the default name for the property PD.
diff --git a/clang/test/CodeGenCXX/debug-info-template-align.cpp b/clang/test/CodeGenCXX/debug-info-template-align.cpp
deleted file mode 100644
index 42fdb269a30b..000000000000
--- a/clang/test/CodeGenCXX/debug-info-template-align.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Test for debug info related to DW_AT_alignment attribute in the typedef operator
-// Supported: -O0, standalone DI
-// RUN: %clang_cc1 -dwarf-version=5 -emit-llvm -triple x86_64-linux-gnu %s -o - \
-// RUN: -O0 -disable-llvm-passes \
-// RUN: -debug-info-kind=standalone \
-// RUN: | FileCheck %s
-
-// CHECK: DIDerivedType(tag: DW_TAG_typedef, {{.*}}, align: 512
-
-typedef char __attribute__((__aligned__(64))) alchar;
-
-int main() {
- alchar newChar;
-}
diff --git a/llvm/include/llvm-c/DebugInfo.h b/llvm/include/llvm-c/DebugInfo.h
index 891faedb636f..41e9f96bbb92 100644
--- a/llvm/include/llvm-c/DebugInfo.h
+++ b/llvm/include/llvm-c/DebugInfo.h
@@ -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
diff --git a/llvm/include/llvm/IR/DIBuilder.h b/llvm/include/llvm/IR/DIBuilder.h
index 3c738b8a4f9f..ad9a35b55414 100644
--- a/llvm/include/llvm/IR/DIBuilder.h
+++ b/llvm/include/llvm/IR/DIBuilder.h
@@ -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);
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
index 86522a85427a..9d7fee1d5b38 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -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
diff --git a/llvm/lib/IR/DIBuilder.cpp b/llvm/lib/IR/DIBuilder.cpp
index 3280106cf9fd..59b4a5ef8a18 100644
--- a/llvm/lib/IR/DIBuilder.cpp
+++ b/llvm/lib/IR/DIBuilder.cpp
@@ -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);
}
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index 62bfeb5c5d77..1bbe6b85d260 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -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
diff --git a/llvm/test/DebugInfo/X86/debug-info-template-align.ll b/llvm/test/DebugInfo/X86/debug-info-template-align.ll
deleted file mode 100644
index be476a358da6..000000000000
--- a/llvm/test/DebugInfo/X86/debug-info-template-align.ll
+++ /dev/null
@@ -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)
diff --git a/llvm/tools/llvm-c-test/debuginfo.c b/llvm/tools/llvm-c-test/debuginfo.c
index b5080f01193b..e498de6a745a 100644
--- a/llvm/tools/llvm-c-test/debuginfo.c
+++ b/llvm/tools/llvm-c-test/debuginfo.c
@@ -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);
More information about the llvm-commits
mailing list