diff options
| -rw-r--r-- | llvm/include/llvm/IR/DebugInfoMetadata.h | 5 | ||||
| -rw-r--r-- | llvm/lib/IR/DebugInfoMetadata.cpp | 9 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Utils/Local.cpp | 6 |
3 files changed, 16 insertions, 4 deletions
diff --git a/llvm/include/llvm/IR/DebugInfoMetadata.h b/llvm/include/llvm/IR/DebugInfoMetadata.h index e1a7b8629c4..0e43a05b318 100644 --- a/llvm/include/llvm/IR/DebugInfoMetadata.h +++ b/llvm/include/llvm/IR/DebugInfoMetadata.h @@ -2551,6 +2551,11 @@ public: return 0; } + /// Append a zero- or sign-extension to \p Expr. Converts the expression to a + /// stack value if it isn't one already. + static DIExpression *appendExt(const DIExpression *Expr, unsigned FromSize, + unsigned ToSize, bool Signed); + /// Check if fragments overlap between a pair of FragmentInfos. static bool fragmentsOverlap(const FragmentInfo &A, const FragmentInfo &B) { return fragmentCmp(A, B) == 0; diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp index 8ccd8559823..e4036ee1eb0 100644 --- a/llvm/lib/IR/DebugInfoMetadata.cpp +++ b/llvm/lib/IR/DebugInfoMetadata.cpp @@ -1189,6 +1189,15 @@ bool DIExpression::isConstant() const { return true; } +DIExpression *DIExpression::appendExt(const DIExpression *Expr, + unsigned FromSize, unsigned ToSize, + bool Signed) { + dwarf::TypeKind TK = Signed ? dwarf::DW_ATE_signed : dwarf::DW_ATE_unsigned; + uint64_t Ops[] = {dwarf::DW_OP_LLVM_convert, FromSize, TK, + dwarf::DW_OP_LLVM_convert, ToSize, TK}; + return appendToStack(Expr, Ops); +} + DIGlobalVariableExpression * DIGlobalVariableExpression::getImpl(LLVMContext &Context, Metadata *Variable, Metadata *Expression, StorageType Storage, diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp index d5ae13ad285..aa1341eea05 100644 --- a/llvm/lib/Transforms/Utils/Local.cpp +++ b/llvm/lib/Transforms/Utils/Local.cpp @@ -1867,10 +1867,8 @@ bool llvm::replaceAllDbgUsesWith(Instruction &From, Value &To, return None; bool Signed = *Signedness == DIBasicType::Signedness::Signed; - dwarf::TypeKind TK = Signed ? dwarf::DW_ATE_signed : dwarf::DW_ATE_unsigned; - SmallVector<uint64_t, 8> Ops({dwarf::DW_OP_LLVM_convert, ToBits, TK, - dwarf::DW_OP_LLVM_convert, FromBits, TK}); - return DIExpression::appendToStack(DII.getExpression(), Ops); + return DIExpression::appendExt(DII.getExpression(), ToBits, FromBits, + Signed); }; return rewriteDebugUsers(From, To, DomPoint, DT, SignOrZeroExt); } |
