diff options
| author | Markus Lavin <markus.lavin@ericsson.com> | 2019-03-19 09:17:28 +0000 | 
|---|---|---|
| committer | Markus Lavin <markus.lavin@ericsson.com> | 2019-03-19 09:17:28 +0000 | 
| commit | ad78768d5933bfa50009e8b6f84150291a8aba8f (patch) | |
| tree | 1a90ef53cc92f803791ebeaa3169aae516048b52 /llvm/lib/IR | |
| parent | d2f2f33ef2d071ba535e57b1637ebd9cc3206d51 (diff) | |
| download | bcm5719-llvm-ad78768d5933bfa50009e8b6f84150291a8aba8f.tar.gz bcm5719-llvm-ad78768d5933bfa50009e8b6f84150291a8aba8f.zip  | |
Revert "[DebugInfo] Introduce DW_OP_LLVM_convert"
This reverts commit 1cf4b593a7ebd666fc6775f3bd38196e8e65fafe.
Build bots found failing tests not detected locally.
Failing Tests (3):
  LLVM :: DebugInfo/Generic/convert-debugloc.ll
  LLVM :: DebugInfo/Generic/convert-inlined.ll
  LLVM :: DebugInfo/Generic/convert-linked.ll
llvm-svn: 356444
Diffstat (limited to 'llvm/lib/IR')
| -rw-r--r-- | llvm/lib/IR/AsmWriter.cpp | 9 | ||||
| -rw-r--r-- | llvm/lib/IR/DebugInfoMetadata.cpp | 2 | 
2 files changed, 2 insertions, 9 deletions
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp index 07dea403d56..af3db5186a2 100644 --- a/llvm/lib/IR/AsmWriter.cpp +++ b/llvm/lib/IR/AsmWriter.cpp @@ -2123,13 +2123,8 @@ static void writeDIExpression(raw_ostream &Out, const DIExpression *N,        assert(!OpStr.empty() && "Expected valid opcode");        Out << FS << OpStr; -      if (I->getOp() == dwarf::DW_OP_LLVM_convert) { -        Out << FS << I->getArg(0); -        Out << FS << dwarf::AttributeEncodingString(I->getArg(1)); -      } else { -        for (unsigned A = 0, AE = I->getNumArgs(); A != AE; ++A) -          Out << FS << I->getArg(A); -      } +      for (unsigned A = 0, AE = I->getNumArgs(); A != AE; ++A) +        Out << FS << I->getArg(A);      }    } else {      for (const auto &I : N->getElements()) diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp index 0ae408af041..f772276613c 100644 --- a/llvm/lib/IR/DebugInfoMetadata.cpp +++ b/llvm/lib/IR/DebugInfoMetadata.cpp @@ -813,7 +813,6 @@ DIExpression *DIExpression::getImpl(LLVMContext &Context,  unsigned DIExpression::ExprOperand::getSize() const {    switch (getOp()) { -  case dwarf::DW_OP_LLVM_convert:    case dwarf::DW_OP_LLVM_fragment:      return 3;    case dwarf::DW_OP_constu: @@ -858,7 +857,6 @@ bool DIExpression::isValid() const {          return false;        break;      } -    case dwarf::DW_OP_LLVM_convert:      case dwarf::DW_OP_constu:      case dwarf::DW_OP_plus_uconst:      case dwarf::DW_OP_plus:  | 

