diff options
| -rw-r--r-- | llvm/include/llvm/IR/IntrinsicInst.h | 16 | ||||
| -rw-r--r-- | llvm/include/llvm/IR/Metadata.h | 10 | ||||
| -rw-r--r-- | llvm/lib/IR/Verifier.cpp | 4 |
3 files changed, 24 insertions, 6 deletions
diff --git a/llvm/include/llvm/IR/IntrinsicInst.h b/llvm/include/llvm/IR/IntrinsicInst.h index 72ab46d8af9..bf0adc39347 100644 --- a/llvm/include/llvm/IR/IntrinsicInst.h +++ b/llvm/include/llvm/IR/IntrinsicInst.h @@ -82,8 +82,12 @@ namespace llvm { class DbgDeclareInst : public DbgInfoIntrinsic { public: Value *getAddress() const; - MDNode *getVariable() const { return cast<MDNode>(getRawVariable()); } - MDNode *getExpression() const { return cast<MDNode>(getRawExpression()); } + MDLocalVariable *getVariable() const { + return cast<MDLocalVariable>(getRawVariable()); + } + MDExpression *getExpression() const { + return cast<MDExpression>(getRawExpression()); + } Metadata *getRawVariable() const { return cast<MetadataAsValue>(getArgOperand(1))->getMetadata(); @@ -111,8 +115,12 @@ namespace llvm { return cast<ConstantInt>( const_cast<Value*>(getArgOperand(1)))->getZExtValue(); } - MDNode *getVariable() const { return cast<MDNode>(getRawVariable()); } - MDNode *getExpression() const { return cast<MDNode>(getRawExpression()); } + MDLocalVariable *getVariable() const { + return cast<MDLocalVariable>(getRawVariable()); + } + MDExpression *getExpression() const { + return cast<MDExpression>(getRawExpression()); + } Metadata *getRawVariable() const { return cast<MetadataAsValue>(getArgOperand(2))->getMetadata(); diff --git a/llvm/include/llvm/IR/Metadata.h b/llvm/include/llvm/IR/Metadata.h index c01cc7c92ee..6ba0fd41730 100644 --- a/llvm/include/llvm/IR/Metadata.h +++ b/llvm/include/llvm/IR/Metadata.h @@ -128,6 +128,16 @@ public: #define HANDLE_METADATA(CLASS) class CLASS; #include "llvm/IR/Metadata.def" +// Provide specializations of isa so that we don't need definitions of +// subclasses to see if the metadata is a subclass. +#define HANDLE_METADATA_LEAF(CLASS) \ + template <> struct isa_impl<CLASS, Metadata> { \ + static inline bool doit(const Metadata &MD) { \ + return MD.getMetadataID() == Metadata::CLASS##Kind; \ + } \ + }; +#include "llvm/IR/Metadata.def" + inline raw_ostream &operator<<(raw_ostream &OS, const Metadata &MD) { MD.print(OS); return OS; diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index f0071060276..084bfb81a97 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -3032,8 +3032,8 @@ void Verifier::visitDbgIntrinsic(StringRef Kind, DbgIntrinsicTy &DII) { DII.getRawExpression()); // Don't call visitMDNode(), since that will recurse through operands. - visitMDLocalVariable(*cast<MDLocalVariable>(DII.getVariable())); - visitMDExpression(*cast<MDExpression>(DII.getExpression())); + visitMDLocalVariable(*DII.getVariable()); + visitMDExpression(*DII.getExpression()); } void DebugInfoVerifier::verifyDebugInfo() { |
