Revert "[MLIR][LLVM] Make DISubprogramAttr cyclic" #106827
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit d884b77.
llvmbot
added
mlir:llvm
mlir
flang
|
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-llvm Author: Tobias Gysi (gysit) ChangesReverts llvm/llvm-project#106571 This commit breaks the following build bot: Patch is 53.63 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/106827.diff 14 Files Affected:
diff --git a/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp b/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp
index 029d3776bcc0b8..54f2a12d800085 100644
--- a/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp
+++ b/flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp
@@ -146,8 +146,8 @@ mlir::LLVM::DITypeAttr DebugTypeGenerator::convertBoxedSequenceType(
elements.push_back(subrangeTy);
}
return mlir::LLVM::DICompositeTypeAttr::get(
- context, llvm::dwarf::DW_TAG_array_type, /*name=*/nullptr,
- /*file=*/nullptr, /*line=*/0, /*scope=*/nullptr, elemTy,
+ context, llvm::dwarf::DW_TAG_array_type, /*recursive_id=*/{},
+ /*name=*/nullptr, /*file=*/nullptr, /*line=*/0, /*scope=*/nullptr, elemTy,
mlir::LLVM::DIFlags::Zero, /*sizeInBits=*/0, /*alignInBits=*/0, elements,
dataLocation, /*rank=*/nullptr, allocated, associated);
}
@@ -188,7 +188,7 @@ mlir::LLVM::DITypeAttr DebugTypeGenerator::convertRecordType(
}
return mlir::LLVM::DICompositeTypeAttr::get(
- context, llvm::dwarf::DW_TAG_structure_type,
+ context, llvm::dwarf::DW_TAG_structure_type, /*recursive_id=*/{},
mlir::StringAttr::get(context, result.second.name), fileAttr, line, scope,
/*baseType=*/nullptr, mlir::LLVM::DIFlags::Zero, offset * 8,
/*alignInBits=*/0, elements, /*dataLocation=*/nullptr, /*rank=*/nullptr,
@@ -236,8 +236,8 @@ mlir::LLVM::DITypeAttr DebugTypeGenerator::convertSequenceType(
// have been set to some valid default values.
return mlir::LLVM::DICompositeTypeAttr::get(
- context, llvm::dwarf::DW_TAG_array_type, /*name=*/nullptr,
- /*file=*/nullptr, /*line=*/0, /*scope=*/nullptr, elemTy,
+ context, llvm::dwarf::DW_TAG_array_type, /*recursive_id=*/{},
+ /*name=*/nullptr, /*file=*/nullptr, /*line=*/0, /*scope=*/nullptr, elemTy,
mlir::LLVM::DIFlags::Zero, /*sizeInBits=*/0, /*alignInBits=*/0, elements,
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
/*associated=*/nullptr);
diff --git a/mlir/include/mlir-c/Dialect/LLVM.h b/mlir/include/mlir-c/Dialect/LLVM.h
index 38bd4d2f3587be..5eb96a86e472d6 100644
--- a/mlir/include/mlir-c/Dialect/LLVM.h
+++ b/mlir/include/mlir-c/Dialect/LLVM.h
@@ -234,13 +234,10 @@ MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDIBasicTypeAttrGet(
MlirContext ctx, unsigned int tag, MlirAttribute name, uint64_t sizeInBits,
MlirLLVMTypeEncoding encoding);
-/// Creates a self-referencing LLVM DICompositeType attribute.
-MlirAttribute mlirLLVMDICompositeTypeAttrGetRecSelf(MlirAttribute recId);
-
/// Creates a LLVM DICompositeType attribute.
MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDICompositeTypeAttrGet(
- MlirContext ctx, MlirAttribute recId, bool isRecSelf, unsigned int tag,
- MlirAttribute name, MlirAttribute file, uint32_t line, MlirAttribute scope,
+ MlirContext ctx, unsigned int tag, MlirAttribute recId, MlirAttribute name,
+ MlirAttribute file, uint32_t line, MlirAttribute scope,
MlirAttribute baseType, int64_t flags, uint64_t sizeInBits,
uint64_t alignInBits, intptr_t nElements, MlirAttribute const *elements,
MlirAttribute dataLocation, MlirAttribute rank, MlirAttribute allocated,
@@ -314,16 +311,13 @@ MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDILocalVariableAttrGet(
MlirAttribute diFile, unsigned int line, unsigned int arg,
unsigned int alignInBits, MlirAttribute diType, int64_t flags);
-/// Creates a self-referencing LLVM DISubprogramAttr attribute.
-MlirAttribute mlirLLVMDISubprogramAttrGetRecSelf(MlirAttribute recId);
-
/// Creates a LLVM DISubprogramAttr attribute.
MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDISubprogramAttrGet(
- MlirContext ctx, MlirAttribute recId, bool isRecSelf, MlirAttribute id,
- MlirAttribute compileUnit, MlirAttribute scope, MlirAttribute name,
- MlirAttribute linkageName, MlirAttribute file, unsigned int line,
- unsigned int scopeLine, uint64_t subprogramFlags, MlirAttribute type,
- intptr_t nRetainedNodes, MlirAttribute const *retainedNodes);
+ MlirContext ctx, MlirAttribute id, MlirAttribute compileUnit,
+ MlirAttribute scope, MlirAttribute name, MlirAttribute linkageName,
+ MlirAttribute file, unsigned int line, unsigned int scopeLine,
+ uint64_t subprogramFlags, MlirAttribute type, intptr_t nRetainedNodes,
+ MlirAttribute const *retainedNodes);
/// Gets the scope from this DISubprogramAttr.
MLIR_CAPI_EXPORTED MlirAttribute
@@ -362,9 +356,9 @@ MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDIModuleAttrGet(
/// Creates a LLVM DIImportedEntityAttr attribute.
MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDIImportedEntityAttrGet(
- MlirContext ctx, unsigned int tag, MlirAttribute scope,
- MlirAttribute entity, MlirAttribute file, unsigned int line,
- MlirAttribute name, intptr_t nElements, MlirAttribute const *elements);
+ MlirContext ctx, unsigned int tag, MlirAttribute entity, MlirAttribute file,
+ unsigned int line, MlirAttribute name, intptr_t nElements,
+ MlirAttribute const *elements);
/// Gets the scope of this DIModuleAttr.
MLIR_CAPI_EXPORTED MlirAttribute
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
index 49e54df3436ff3..e57be7f760d380 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
@@ -271,7 +271,7 @@ def LLVM_DILanguageParameter : LLVM_DIParameter<
>;
def LLVM_DITagParameter : LLVM_DIParameter<
- "tag", /*default=*/"0", "Tag", /*errorCase=*/"llvm::dwarf::DW_TAG_invalid"
+ "tag", /*default=*/"", "Tag", /*errorCase=*/"llvm::dwarf::DW_TAG_invalid"
>;
def LLVM_DIOperationEncodingParameter : LLVM_DIParameter<
@@ -375,17 +375,14 @@ def LLVM_DICompositeTypeAttr : LLVM_Attr<"DICompositeType", "di_composite_type",
[LLVM_DIRecursiveTypeAttrInterface],
"DITypeAttr"> {
let parameters = (ins
- // DIRecursiveTypeAttrInterface specific parameters.
- OptionalParameter<"DistinctAttr">:$recId,
- OptionalParameter<"bool">:$isRecSelf,
- // DICompositeType specific parameters.
LLVM_DITagParameter:$tag,
+ OptionalParameter<"DistinctAttr">:$recId,
OptionalParameter<"StringAttr">:$name,
OptionalParameter<"DIFileAttr">:$file,
OptionalParameter<"uint32_t">:$line,
OptionalParameter<"DIScopeAttr">:$scope,
OptionalParameter<"DITypeAttr">:$baseType,
- OptionalParameter<"DIFlags">:$flags,
+ OptionalParameter<"DIFlags", "DIFlags::Zero">:$flags,
OptionalParameter<"uint64_t">:$sizeInBits,
OptionalParameter<"uint64_t">:$alignInBits,
OptionalArrayRefParameter<"DINodeAttr">:$elements,
@@ -394,26 +391,14 @@ def LLVM_DICompositeTypeAttr : LLVM_Attr<"DICompositeType", "di_composite_type",
OptionalParameter<"DIExpressionAttr">:$allocated,
OptionalParameter<"DIExpressionAttr">:$associated
);
- let builders = [
- AttrBuilder<(ins
- "unsigned":$tag, "StringAttr":$name, "DIFileAttr":$file,
- "uint32_t":$line, "DIScopeAttr":$scope, "DITypeAttr":$baseType,
- "DIFlags":$flags, "uint64_t":$sizeInBits, "uint64_t":$alignInBits,
- "ArrayRef<DINodeAttr>":$elements, "DIExpressionAttr":$dataLocation,
- "DIExpressionAttr":$rank, "DIExpressionAttr":$allocated,
- "DIExpressionAttr":$associated
- ), [{
- return $_get($_ctxt, /*recId=*/nullptr, /*isRecSelf=*/nullptr,
- tag, name, file, line, scope, baseType, flags, sizeInBits,
- alignInBits, elements, dataLocation, rank, allocated,
- associated);
- }]>
- ];
let assemblyFormat = "`<` struct(params) `>`";
let extraClassDeclaration = [{
/// Requirements of DIRecursiveTypeAttrInterface.
/// @{
+ /// Get whether this attr describes a recursive self reference.
+ bool isRecSelf() { return getTag() == 0; }
+
/// Get a copy of this type attr but with the recursive ID set to `recId`.
DIRecursiveTypeAttrInterface withRecId(DistinctAttr recId);
@@ -569,19 +554,14 @@ def LLVM_DILocalVariableAttr : LLVM_Attr<"DILocalVariable", "di_local_variable",
//===----------------------------------------------------------------------===//
def LLVM_DISubprogramAttr : LLVM_Attr<"DISubprogram", "di_subprogram",
- [LLVM_DIRecursiveTypeAttrInterface],
- "DIScopeAttr"> {
+ /*traits=*/[], "DIScopeAttr"> {
let parameters = (ins
- // DIRecursiveTypeAttrInterface specific parameters.
- OptionalParameter<"DistinctAttr">:$recId,
- OptionalParameter<"bool">:$isRecSelf,
- // DISubprogramAttr specific parameters.
OptionalParameter<"DistinctAttr">:$id,
OptionalParameter<"DICompileUnitAttr">:$compileUnit,
- OptionalParameter<"DIScopeAttr">:$scope,
+ "DIScopeAttr":$scope,
OptionalParameter<"StringAttr">:$name,
OptionalParameter<"StringAttr">:$linkageName,
- OptionalParameter<"DIFileAttr">:$file,
+ "DIFileAttr":$file,
OptionalParameter<"unsigned">:$line,
OptionalParameter<"unsigned">:$scopeLine,
OptionalParameter<"DISubprogramFlags">:$subprogramFlags,
@@ -589,31 +569,21 @@ def LLVM_DISubprogramAttr : LLVM_Attr<"DISubprogram", "di_subprogram",
OptionalArrayRefParameter<"DINodeAttr">:$retainedNodes
);
let builders = [
- AttrBuilder<(ins
+ AttrBuilderWithInferredContext<(ins
"DistinctAttr":$id, "DICompileUnitAttr":$compileUnit,
- "DIScopeAttr":$scope, "StringAttr":$name, "StringAttr":$linkageName,
+ "DIScopeAttr":$scope, "StringRef":$name, "StringRef":$linkageName,
"DIFileAttr":$file, "unsigned":$line, "unsigned":$scopeLine,
"DISubprogramFlags":$subprogramFlags, "DISubroutineTypeAttr":$type,
"ArrayRef<DINodeAttr>":$retainedNodes
), [{
- return $_get($_ctxt, /*recId=*/nullptr, /*isRecSelf=*/false, id, compileUnit,
- scope, name, linkageName, file, line, scopeLine,
- subprogramFlags, type, retainedNodes);
+ MLIRContext *ctx = file.getContext();
+ return $_get(ctx, id, compileUnit, scope, StringAttr::get(ctx, name),
+ StringAttr::get(ctx, linkageName), file, line,
+ scopeLine, subprogramFlags, type, retainedNodes);
}]>
];
- let assemblyFormat = "`<` struct(params) `>`";
- let extraClassDeclaration = [{
- /// Requirements of DIRecursiveTypeAttrInterface.
- /// @{
-
- /// Get a copy of this type attr but with the recursive ID set to `recId`.
- DIRecursiveTypeAttrInterface withRecId(DistinctAttr recId);
- /// Build a rec-self instance using the provided `recId`.
- static DIRecursiveTypeAttrInterface getRecSelf(DistinctAttr recId);
-
- /// @}
- }];
+ let assemblyFormat = "`<` struct(params) `>`";
}
//===----------------------------------------------------------------------===//
@@ -657,9 +627,13 @@ def LLVM_DINamespaceAttr : LLVM_Attr<"DINamespace", "di_namespace",
def LLVM_DIImportedEntityAttr : LLVM_Attr<"DIImportedEntity", "di_imported_entity",
/*traits=*/[], "DINodeAttr"> {
+ /// TODO: DIImportedEntity has a 'scope' field which represents the scope where
+ /// this entity is imported. Currently, we are not adding a 'scope' field in
+ /// DIImportedEntityAttr to avoid cyclic dependency. As DIImportedEntityAttr
+ /// entries will be contained inside a scope entity (e.g. DISubprogramAttr),
+ /// the scope can easily be inferred.
let parameters = (ins
LLVM_DITagParameter:$tag,
- "DIScopeAttr":$scope,
"DINodeAttr":$entity,
OptionalParameter<"DIFileAttr">:$file,
OptionalParameter<"unsigned">:$line,
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMInterfaces.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMInterfaces.td
index e2180410a8f04e..7085f81e203a1e 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMInterfaces.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMInterfaces.td
@@ -406,7 +406,7 @@ def LLVM_DIRecursiveTypeAttrInterface
let methods = [
InterfaceMethod<[{
Get whether this attr describes a recursive self reference.
- }], "bool", "getIsRecSelf", (ins)>,
+ }], "bool", "isRecSelf", (ins)>,
InterfaceMethod<[{
Get the recursive ID used for matching "rec-decl" with "rec-self".
If this attr instance is not recursive, return a null attribute.
diff --git a/mlir/lib/CAPI/Dialect/LLVM.cpp b/mlir/lib/CAPI/Dialect/LLVM.cpp
index 03b536d7aad98f..13341f0c4de881 100644
--- a/mlir/lib/CAPI/Dialect/LLVM.cpp
+++ b/mlir/lib/CAPI/Dialect/LLVM.cpp
@@ -159,14 +159,9 @@ MlirAttribute mlirLLVMDIBasicTypeAttrGet(MlirContext ctx, unsigned int tag,
unwrap(ctx), tag, cast<StringAttr>(unwrap(name)), sizeInBits, encoding));
}
-MlirAttribute mlirLLVMDICompositeTypeAttrGetRecSelf(MlirAttribute recId) {
- return wrap(
- DICompositeTypeAttr::getRecSelf(cast<DistinctAttr>(unwrap(recId))));
-}
-
MlirAttribute mlirLLVMDICompositeTypeAttrGet(
- MlirContext ctx, MlirAttribute recId, bool isRecSelf, unsigned int tag,
- MlirAttribute name, MlirAttribute file, uint32_t line, MlirAttribute scope,
+ MlirContext ctx, unsigned int tag, MlirAttribute recId, MlirAttribute name,
+ MlirAttribute file, uint32_t line, MlirAttribute scope,
MlirAttribute baseType, int64_t flags, uint64_t sizeInBits,
uint64_t alignInBits, intptr_t nElements, MlirAttribute const *elements,
MlirAttribute dataLocation, MlirAttribute rank, MlirAttribute allocated,
@@ -175,7 +170,7 @@ MlirAttribute mlirLLVMDICompositeTypeAttrGet(
elementsStorage.reserve(nElements);
return wrap(DICompositeTypeAttr::get(
- unwrap(ctx), cast<DistinctAttr>(unwrap(recId)), isRecSelf, tag,
+ unwrap(ctx), tag, cast<DistinctAttr>(unwrap(recId)),
cast<StringAttr>(unwrap(name)), cast<DIFileAttr>(unwrap(file)), line,
cast<DIScopeAttr>(unwrap(scope)), cast<DITypeAttr>(unwrap(baseType)),
DIFlags(flags), sizeInBits, alignInBits,
@@ -294,21 +289,16 @@ MlirAttribute mlirLLVMDISubroutineTypeAttrGet(MlirContext ctx,
[](Attribute a) { return cast<DITypeAttr>(a); })));
}
-MlirAttribute mlirLLVMDISubprogramAttrGetRecSelf(MlirAttribute recId) {
- return wrap(DISubprogramAttr::getRecSelf(cast<DistinctAttr>(unwrap(recId))));
-}
-
MlirAttribute mlirLLVMDISubprogramAttrGet(
- MlirContext ctx, MlirAttribute recId, bool isRecSelf, MlirAttribute id,
- MlirAttribute compileUnit, MlirAttribute scope, MlirAttribute name,
- MlirAttribute linkageName, MlirAttribute file, unsigned int line,
- unsigned int scopeLine, uint64_t subprogramFlags, MlirAttribute type,
- intptr_t nRetainedNodes, MlirAttribute const *retainedNodes) {
+ MlirContext ctx, MlirAttribute id, MlirAttribute compileUnit,
+ MlirAttribute scope, MlirAttribute name, MlirAttribute linkageName,
+ MlirAttribute file, unsigned int line, unsigned int scopeLine,
+ uint64_t subprogramFlags, MlirAttribute type, intptr_t nRetainedNodes,
+ MlirAttribute const *retainedNodes) {
SmallVector<Attribute> nodesStorage;
nodesStorage.reserve(nRetainedNodes);
return wrap(DISubprogramAttr::get(
- unwrap(ctx), cast<DistinctAttr>(unwrap(recId)), isRecSelf,
- cast<DistinctAttr>(unwrap(id)),
+ unwrap(ctx), cast<DistinctAttr>(unwrap(id)),
cast<DICompileUnitAttr>(unwrap(compileUnit)),
cast<DIScopeAttr>(unwrap(scope)), cast<StringAttr>(unwrap(name)),
cast<StringAttr>(unwrap(linkageName)), cast<DIFileAttr>(unwrap(file)),
@@ -363,15 +353,14 @@ MlirAttribute mlirLLVMDIModuleAttrGetScope(MlirAttribute diModule) {
}
MlirAttribute mlirLLVMDIImportedEntityAttrGet(
- MlirContext ctx, unsigned int tag, MlirAttribute scope,
- MlirAttribute entity, MlirAttribute file, unsigned int line,
- MlirAttribute name, intptr_t nElements, MlirAttribute const *elements) {
+ MlirContext ctx, unsigned int tag, MlirAttribute entity, MlirAttribute file,
+ unsigned int line, MlirAttribute name, intptr_t nElements,
+ MlirAttribute const *elements) {
SmallVector<Attribute> elementsStorage;
elementsStorage.reserve(nElements);
return wrap(DIImportedEntityAttr::get(
- unwrap(ctx), tag, cast<DIScopeAttr>(unwrap(scope)),
- cast<DINodeAttr>(unwrap(entity)), cast<DIFileAttr>(unwrap(file)), line,
- cast<StringAttr>(unwrap(name)),
+ unwrap(ctx), tag, cast<DINodeAttr>(unwrap(entity)),
+ cast<DIFileAttr>(unwrap(file)), line, cast<StringAttr>(unwrap(name)),
llvm::map_to_vector(unwrapList(nElements, elements, elementsStorage),
[](Attribute a) { return cast<DINodeAttr>(a); })));
}
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMAttrs.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMAttrs.cpp
index 491dcc7f01e73d..98a9659735e7e6 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMAttrs.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMAttrs.cpp
@@ -203,33 +203,16 @@ void printExpressionArg(AsmPrinter &printer, uint64_t opcode,
DIRecursiveTypeAttrInterface
DICompositeTypeAttr::withRecId(DistinctAttr recId) {
return DICompositeTypeAttr::get(
- getContext(), recId, getIsRecSelf(), getTag(), getName(), getFile(),
- getLine(), getScope(), getBaseType(), getFlags(), getSizeInBits(),
- getAlignInBits(), getElements(), getDataLocation(), getRank(),
- getAllocated(), getAssociated());
+ getContext(), getTag(), recId, getName(), getFile(), getLine(),
+ getScope(), getBaseType(), getFlags(), getSizeInBits(), getAlignInBits(),
+ getElements(), getDataLocation(), getRank(), getAllocated(),
+ getAssociated());
}
DIRecursiveTypeAttrInterface
DICompositeTypeAttr::getRecSelf(DistinctAttr recId) {
- return DICompositeTypeAttr::get(recId.getContext(), recId, /*isRecSelf=*/true,
- 0, {}, {}, 0, {}, {}, DIFlags(), 0, 0, {}, {},
- {}, {}, {});
-}
-
-//===----------------------------------------------------------------------===//
-// DISubprogramAttr
-//===----------------------------------------------------------------------===//
-
-DIRecursiveTypeAttrInterface DISubprogramAttr::withRecId(DistinctAttr recId) {
- return DISubprogramAttr::get(
- getContext(), recId, getIsRecSelf(), getId(), getCompileUnit(),
- getScope(), getName(), getLinkageName(), getFile(), getLine(),
- getScopeLine(), getSubprogramFlags(), getType(), getRetainedNodes());
-}
-
-DIRecursiveTypeAttrInterface DISubprogramAttr::getRecSelf(DistinctAttr recId) {
- return DISubprogramAttr::get(recId.getContext(), recId, /*isRecSelf=*/true,
- {}, {}, {}, {}, {}, 0, 0, {}, {}, {}, {});
+ return DICompositeTypeAttr::get(recId.getContext(), 0, recId, {}, {}, 0, {},
+ {}, DIFlags(), 0, 0, {}, {}, {}, {}, {});
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
index 6e4a964f1fc93c..3870aab52f199d 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -3155,9 +3155,9 @@ struct LLVMOpAsmDialectInterface : public OpAsmDialectInterface {
.Case<AccessGroupAttr, AliasScopeAttr, AliasScopeDomainAttr,
DIBasicTypeAttr, DICompileUnitAttr, DICompositeTypeAttr,
DIDerivedTypeAttr, DIFileAttr, DIGlobalVariableAttr,
- DIGlobalVariableExpressionAttr, DIImportedEntityAttr, DILabelAttr,
- DILexicalBlockAttr, DILexicalBlockFileAttr, DILocalVariableAttr,
- DIModuleAttr, DINamespaceAttr, DINullTypeAttr, DIStringTypeAttr,
+ DIGlobalVariableExpressionAttr, DILabelAttr, DILexicalBlockAttr,
+ DILexicalBlockFileAttr, DILocalVariableAttr, DIModuleAttr,
+ DINamespaceAttr, DINullTypeAttr, DIStringTypeAttr,
DISubprogramAttr, DISubroutineTypeAttr, LoopAnnotationAttr,
LoopVectorizeAttr, LoopInterleaveAttr, LoopUnrollAttr,
LoopUnrollAndJamAttr, LoopLICMAttr, LoopDistributeAttr,
diff --git a/mlir/lib/Dialect/LLVMIR/Transforms/DIScopeForLLVMFuncOp.cpp b/mlir/lib/Dialect/LLVMIR/Transforms/DIScopeForLLVMFuncOp.cpp
index 2cfaffa7c8efce..c75f44bf3976a9 100644
--- a/mlir/lib/Dialect/LLVMIR/Transforms/DIS...
[truncated]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #106571
This commit breaks the following build bot:
https://lab.llvm.org/buildbot/#/builders/138/builds/2992
It looks like there is a missing dependency in this particular setup.