<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 12, 2015 at 5:07 PM, Duncan P. N. Exon Smith <span dir="ltr"><<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dexonsmith<br>
Date: Thu Feb 12 19:07:46 2015<br>
New Revision: 229002<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229002&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229002&view=rev</a><br>
Log:<br>
IR: Add MDExpression::ExprOperand<br>
<br>
Port `DIExpression::Operand` over to `MDExpression::ExprOperand`.</blockquote><div><br>Any particular reason for the extra "Expr" in there - since it's the MDExpression's operand it seems clear that it's an expression operand? <br><br>(but I guess it conflicts with the MDNode operands in some way?)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> The<br>
logic is needed directly in `MDExpression` to support printing in<br>
assembly.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/IR/DebugInfoMetadata.h<br>
llvm/trunk/lib/IR/DebugInfoMetadata.cpp<br>
llvm/trunk/lib/IR/Verifier.cpp<br>
llvm/trunk/unittests/IR/MetadataTest.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/IR/DebugInfoMetadata.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfoMetadata.h?rev=229002&r1=229001&r2=229002&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfoMetadata.h?rev=229002&r1=229001&r2=229002&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IR/DebugInfoMetadata.h (original)<br>
+++ llvm/trunk/include/llvm/IR/DebugInfoMetadata.h Thu Feb 12 19:07:46 2015<br>
@@ -1401,6 +1401,85 @@ public:<br>
element_iterator elements_begin() const { return getElements().begin(); }<br>
element_iterator elements_end() const { return getElements().end(); }<br>
<br>
+ /// \brief A lightweight wrapper around an expression operand.<br>
+ ///<br>
+ /// TODO: Store arguments directly and change \a MDExpression to store a<br>
+ /// range of these.<br>
+ class ExprOperand {<br>
+ const uint64_t *Op;<br>
+<br>
+ public:<br>
+ explicit ExprOperand(const uint64_t *Op) : Op(Op) {}<br>
+<br>
+ const uint64_t *get() const { return Op; }<br>
+<br>
+ /// \brief Get the operand code.<br>
+ uint64_t getOp() const { return *Op; }<br>
+<br>
+ /// \brief Get an argument to the operand.<br>
+ ///<br>
+ /// Never returns the operand itself.<br>
+ uint64_t getArg(unsigned I) const { return Op[I + 1]; }<br>
+<br>
+ unsigned getNumArgs() const { return getSize() - 1; }<br>
+<br>
+ /// \brief Return the size of the operand.<br>
+ ///<br>
+ /// Return the number of elements in the operand (1 + args).<br>
+ unsigned getSize() const;<br>
+ };<br>
+<br>
+ /// \brief An iterator for expression operands.<br>
+ class expr_op_iterator<br>
+ : public std::iterator<std::input_iterator_tag, ExprOperand> {<br>
+ ExprOperand Op;<br>
+<br>
+ public:<br>
+ explicit expr_op_iterator(element_iterator I) : Op(I) {}<br>
+<br>
+ element_iterator getBase() const { return Op.get(); }<br>
+ const ExprOperand &operator*() const { return Op; }<br>
+ const ExprOperand *operator->() const { return &Op; }<br>
+<br>
+ expr_op_iterator &operator++() {<br>
+ increment();<br>
+ return *this;<br>
+ }<br>
+ expr_op_iterator operator++(int) {<br>
+ expr_op_iterator T(*this);<br>
+ increment();<br>
+ return T;<br>
+ }<br>
+<br>
+ bool operator==(const expr_op_iterator &X) const {<br>
+ return getBase() == X.getBase();<br>
+ }<br>
+ bool operator!=(const expr_op_iterator &X) const {<br>
+ return getBase() != X.getBase();<br>
+ }<br>
+<br>
+ private:<br>
+ void increment() { Op = ExprOperand(getBase() + Op.getSize()); }<br>
+ };<br>
+<br>
+ /// \brief Visit the elements via ExprOperand wrappers.<br>
+ ///<br>
+ /// These range iterators visit elements through \a ExprOperand wrappers.<br>
+ /// This is not guaranteed to be a valid range unless \a isValid() gives \c<br>
+ /// true.<br>
+ ///<br>
+ /// \pre \a isValid() gives \c true.<br>
+ /// @{<br>
+ expr_op_iterator expr_op_begin() const {<br>
+ return expr_op_iterator(elements_begin());<br>
+ }<br>
+ expr_op_iterator expr_op_end() const {<br>
+ return expr_op_iterator(elements_end());<br>
+ }<br>
+ /// @}<br>
+<br>
+ bool isValid() const;<br>
+<br>
static bool classof(const Metadata *MD) {<br>
return MD->getMetadataID() == MDExpressionKind;<br>
}<br>
<br>
Modified: llvm/trunk/lib/IR/DebugInfoMetadata.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfoMetadata.cpp?rev=229002&r1=229001&r2=229002&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfoMetadata.cpp?rev=229002&r1=229001&r2=229002&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DebugInfoMetadata.cpp (original)<br>
+++ llvm/trunk/lib/IR/DebugInfoMetadata.cpp Thu Feb 12 19:07:46 2015<br>
@@ -350,6 +350,38 @@ MDExpression *MDExpression::getImpl(LLVM<br>
DEFINE_GETIMPL_STORE_NO_OPS(MDExpression, (Elements));<br>
}<br>
<br>
+unsigned MDExpression::ExprOperand::getSize() const {<br>
+ switch (getOp()) {<br>
+ case dwarf::DW_OP_bit_piece:<br>
+ return 3;<br>
+ case dwarf::DW_OP_plus:<br>
+ return 2;<br>
+ default:<br>
+ return 1;<br>
+ }<br>
+}<br>
+<br>
+bool MDExpression::isValid() const {<br>
+ for (auto I = expr_op_begin(), E = expr_op_end(); I != E; ++I) {<br>
+ // Check that there's space for the operand.<br>
+ if (I->get() + I->getSize() > E->get())<br>
+ return false;<br>
+<br>
+ // Check that the operand is valid.<br>
+ switch (I->getOp()) {<br>
+ default:<br>
+ return false;<br>
+ case dwarf::DW_OP_bit_piece:<br>
+ // Piece expressions must be at the end.<br>
+ return I->get() + I->getSize() == E->get();<br>
+ case dwarf::DW_OP_plus:<br>
+ case dwarf::DW_OP_deref:<br>
+ break;<br>
+ }<br>
+ }<br>
+ return true;<br>
+}<br>
+<br>
MDObjCProperty *MDObjCProperty::getImpl(<br>
LLVMContext &Context, MDString *Name, Metadata *File, unsigned Line,<br>
MDString *GetterName, MDString *SetterName, unsigned Attributes,<br>
<br>
Modified: llvm/trunk/lib/IR/Verifier.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=229002&r1=229001&r2=229002&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=229002&r1=229001&r2=229002&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/Verifier.cpp (original)<br>
+++ llvm/trunk/lib/IR/Verifier.cpp Thu Feb 12 19:07:46 2015<br>
@@ -780,6 +780,7 @@ void Verifier::visitMDLocalVariable(cons<br>
<br>
void Verifier::visitMDExpression(const MDExpression &N) {<br>
Assert1(N.getTag() == dwarf::DW_TAG_expression, "invalid tag", &N);<br>
+ Assert1(N.isValid(), "invalid expression", &N);<br>
}<br>
<br>
void Verifier::visitMDObjCProperty(const MDObjCProperty &N) {<br>
<br>
Modified: llvm/trunk/unittests/IR/MetadataTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/IR/MetadataTest.cpp?rev=229002&r1=229001&r2=229002&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/IR/MetadataTest.cpp?rev=229002&r1=229001&r2=229002&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/IR/MetadataTest.cpp (original)<br>
+++ llvm/trunk/unittests/IR/MetadataTest.cpp Thu Feb 12 19:07:46 2015<br>
@@ -1407,6 +1407,42 @@ TEST_F(MDExpressionTest, get) {<br>
EXPECT_EQ(0u, N->getElement(4));<br>
}<br>
<br>
+TEST_F(MDExpressionTest, isValid) {<br>
+#define EXPECT_VALID(...) \<br>
+ do { \<br>
+ uint64_t Elements[] = {__VA_ARGS__}; \<br>
+ EXPECT_TRUE(MDExpression::get(Context, Elements)->isValid()); \<br>
+ } while (false)<br>
+#define EXPECT_INVALID(...) \<br>
+ do { \<br>
+ uint64_t Elements[] = {__VA_ARGS__}; \<br>
+ EXPECT_FALSE(MDExpression::get(Context, Elements)->isValid()); \<br>
+ } while (false)<br>
+<br>
+ // Empty expression should be valid.<br>
+ EXPECT_TRUE(MDExpression::get(Context, None));<br>
+<br>
+ // Valid constructions.<br>
+ EXPECT_VALID(dwarf::DW_OP_plus, 6);<br>
+ EXPECT_VALID(dwarf::DW_OP_deref);<br>
+ EXPECT_VALID(dwarf::DW_OP_bit_piece, 3, 7);<br>
+ EXPECT_VALID(dwarf::DW_OP_plus, 6, dwarf::DW_OP_deref);<br>
+ EXPECT_VALID(dwarf::DW_OP_deref, dwarf::DW_OP_plus, 6);<br>
+ EXPECT_VALID(dwarf::DW_OP_deref, dwarf::DW_OP_bit_piece, 3, 7);<br>
+ EXPECT_VALID(dwarf::DW_OP_deref, dwarf::DW_OP_plus, 6, dwarf::DW_OP_bit_piece, 3, 7);<br>
+<br>
+ // Invalid constructions.<br>
+ EXPECT_INVALID(~0u);<br>
+ EXPECT_INVALID(dwarf::DW_OP_plus);<br>
+ EXPECT_INVALID(dwarf::DW_OP_bit_piece);<br>
+ EXPECT_INVALID(dwarf::DW_OP_bit_piece, 3);<br>
+ EXPECT_INVALID(dwarf::DW_OP_bit_piece, 3, 7, dwarf::DW_OP_plus, 3);<br>
+ EXPECT_INVALID(dwarf::DW_OP_bit_piece, 3, 7, dwarf::DW_OP_deref);<br>
+<br>
+#undef EXPECT_VALID<br>
+#undef EXPECT_INVALID<br>
+}<br>
+<br>
typedef MetadataTest MDObjCPropertyTest;<br>
<br>
TEST_F(MDObjCPropertyTest, get) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>