DebugInfo: Drop fake DW_TAG_expression

Break MDExpression off of DebugNode (inherit directly from `MDNode`) and
drop the fake `DW_TAG_expression` tag in the process.

AFAICT, there's no real functionality change here.  The tag was
originally used by `DIDescriptor::isExpression()` to discriminate
between `MDNode`s, but in the new hierarchy we don't need that.

Fixes PR22780.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232550 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/IR/DebugInfoMetadata.h b/include/llvm/IR/DebugInfoMetadata.h
index c09b7d0477db539d5ead4e23de5a338b9e027b32..5bf1d01a8dd94252c05fb0dee459c25c755d6985 100644 (file)
--- a/include/llvm/IR/DebugInfoMetadata.h
+++ b/include/llvm/IR/DebugInfoMetadata.h
@@ -146,7 +146,6 @@ public:
     case MDTemplateValueParameterKind:
     case MDGlobalVariableKind:
     case MDLocalVariableKind:
-    case MDExpressionKind:
     case MDObjCPropertyKind:
     case MDImportedEntityKind:
       return true;
@@ -1447,17 +1446,16 @@ public:
 /// \brief DWARF expression.
 ///
 /// TODO: Co-allocate the expression elements.
-/// TODO: Drop fake DW_TAG_expression and separate from DebugNode.
 /// TODO: Separate from MDNode, or otherwise drop Distinct and Temporary
 /// storage types.
-class MDExpression : public DebugNode {
+class MDExpression : public MDNode {
   friend class LLVMContextImpl;
   friend class MDNode;
 
   std::vector<uint64_t> Elements;
 
   MDExpression(LLVMContext &C, StorageType Storage, ArrayRef<uint64_t> Elements)
-      : DebugNode(C, MDExpressionKind, Storage, dwarf::DW_TAG_expression, None),
+      : MDNode(C, MDExpressionKind, Storage, None),
         Elements(Elements.begin(), Elements.end()) {}
   ~MDExpression() {}
 

diff --git a/include/llvm/IR/Metadata.def b/include/llvm/IR/Metadata.def
index 66589e0a7096e6496db006b5bb2f5c3e26798148..fa4274b16313d567a816c651e670b7357245ea1c 100644 (file)
--- a/include/llvm/IR/Metadata.def
+++ b/include/llvm/IR/Metadata.def
@@ -61,6 +61,7 @@ HANDLE_METADATA_LEAF(LocalAsMetadata)
 HANDLE_MDNODE_BRANCH(MDNode)
 HANDLE_MDNODE_LEAF(MDTuple)
 HANDLE_SPECIALIZED_MDNODE_LEAF(MDLocation)
+HANDLE_SPECIALIZED_MDNODE_LEAF(MDExpression)
 HANDLE_SPECIALIZED_MDNODE_BRANCH(DebugNode)
 HANDLE_SPECIALIZED_MDNODE_LEAF(GenericDebugNode)
 HANDLE_SPECIALIZED_MDNODE_LEAF(MDSubrange)
@@ -86,7 +87,6 @@ HANDLE_SPECIALIZED_MDNODE_LEAF(MDTemplateValueParameter)
 HANDLE_SPECIALIZED_MDNODE_BRANCH(MDVariable)
 HANDLE_SPECIALIZED_MDNODE_LEAF(MDGlobalVariable)
 HANDLE_SPECIALIZED_MDNODE_LEAF(MDLocalVariable)
-HANDLE_SPECIALIZED_MDNODE_LEAF(MDExpression)
 HANDLE_SPECIALIZED_MDNODE_LEAF(MDObjCProperty)
 HANDLE_SPECIALIZED_MDNODE_LEAF(MDImportedEntity)
 

diff --git a/include/llvm/Support/Dwarf.def b/include/llvm/Support/Dwarf.def
index c663af94472ddfba888b8a528af1cfa3634d94bf..4b923b897e6f6d8fd2ff0494bd5db9e89d3d7a31 100644 (file)
--- a/include/llvm/Support/Dwarf.def
+++ b/include/llvm/Support/Dwarf.def
@@ -102,7 +102,6 @@ HANDLE_DW_TAG(0x0043, template_alias)
 // Mock tags we use as discriminators.
 HANDLE_DW_TAG(0x0100, auto_variable) // Tag for local (auto) variables.
 HANDLE_DW_TAG(0x0101, arg_variable)  // Tag for argument variables.
-HANDLE_DW_TAG(0x0102, expression)    // Tag for complex address expressions.
 
 // New in DWARF v5.
 HANDLE_DW_TAG(0x0044, coarray_type)

diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp
index b2711a439b67da3af1aa886fa8734f23488a4344..219a7aa16a468ee5875b57b9f3b33340004e19dc 100644 (file)
--- a/lib/IR/Verifier.cpp
+++ b/lib/IR/Verifier.cpp
@@ -754,7 +754,6 @@ void Verifier::visitMDLocalVariable(const MDLocalVariable &N) {
 }
 
 void Verifier::visitMDExpression(const MDExpression &N) {
-  Assert(N.getTag() == dwarf::DW_TAG_expression, "invalid tag", &N);
   Assert(N.isValid(), "invalid expression", &N);
 }