diff options
| -rw-r--r-- | llvm/include/llvm/IR/DIBuilder.h | 3 | ||||
| -rw-r--r-- | llvm/lib/IR/DIBuilder.cpp | 12 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Utils/Local.cpp | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/llvm/include/llvm/IR/DIBuilder.h b/llvm/include/llvm/IR/DIBuilder.h index b0eec7e576b..06753e7fce5 100644 --- a/llvm/include/llvm/IR/DIBuilder.h +++ b/llvm/include/llvm/IR/DIBuilder.h @@ -514,7 +514,8 @@ namespace llvm { /// createExpression - Create a new descriptor for the specified /// variable which has a complex address expression for its address. /// @param Addr An array of complex address operations. - DIExpression createExpression(ArrayRef<int64_t> Addr = None); + DIExpression createExpression(ArrayRef<uint64_t> Addr = None); + DIExpression createExpression(ArrayRef<int64_t> Addr); /// createPieceExpression - Create a descriptor to describe one part /// of aggregate variable that is fragmented across multiple Values. diff --git a/llvm/lib/IR/DIBuilder.cpp b/llvm/lib/IR/DIBuilder.cpp index 4c8dbb72514..a1af40546b7 100644 --- a/llvm/lib/IR/DIBuilder.cpp +++ b/llvm/lib/IR/DIBuilder.cpp @@ -947,17 +947,23 @@ DIVariable DIBuilder::createLocalVariable(unsigned Tag, DIDescriptor Scope, return RetVar; } -DIExpression DIBuilder::createExpression(ArrayRef<int64_t> Addr) { +DIExpression DIBuilder::createExpression(ArrayRef<uint64_t> Addr) { auto Header = HeaderBuilder::get(DW_TAG_expression); - for (int64_t I : Addr) + for (uint64_t I : Addr) Header.concat(I); Metadata *Elts[] = {Header.get(VMContext)}; return DIExpression(MDNode::get(VMContext, Elts)); } +DIExpression DIBuilder::createExpression(ArrayRef<int64_t> Signed) { + // TODO: Remove the callers of this signed version and delete. + SmallVector<uint64_t, 8> Addr(Signed.begin(), Signed.end()); + return createExpression(Addr); +} + DIExpression DIBuilder::createPieceExpression(unsigned OffsetInBytes, unsigned SizeInBytes) { - int64_t Addr[] = {dwarf::DW_OP_piece, OffsetInBytes, SizeInBytes}; + uint64_t Addr[] = {dwarf::DW_OP_piece, OffsetInBytes, SizeInBytes}; return createExpression(Addr); } diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp index c2dfaf52746..b8c0a7e47b5 100644 --- a/llvm/lib/Transforms/Utils/Local.cpp +++ b/llvm/lib/Transforms/Utils/Local.cpp @@ -1123,7 +1123,7 @@ bool llvm::replaceDbgDeclareForAlloca(AllocaInst *AI, Value *NewAllocaAddress, // "deref" operation to a list of address elements, as new llvm.dbg.declare // will take a value storing address of the memory for variable, not // alloca itself. - SmallVector<int64_t, 4> NewDIExpr; + SmallVector<uint64_t, 4> NewDIExpr; NewDIExpr.push_back(dwarf::DW_OP_deref); if (DIExpr) for (unsigned i = 0, n = DIExpr.getNumElements(); i < n; ++i) |
