Author: Fangrui Song Date: 2020-12-15T13:59:31-08:00 New Revision: 59decf8e9c3d86472073266ad8ee1cc699d94525
URL: https://github.com/llvm/llvm-project/commit/59decf8e9c3d86472073266ad8ee1cc699d94525 DIFF: https://github.com/llvm/llvm-project/commit/59decf8e9c3d86472073266ad8ee1cc699d94525.diff LOG: [clang] Migrate deprecated DebugInfo::get to DILocation::get Added: Modified: clang/lib/CodeGen/CGDebugInfo.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 5d48315223f9..7b20d43b0f17 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -115,8 +115,9 @@ void ApplyDebugLocation::init(SourceLocation TemporaryLocation, // Construct a location that has a valid scope, but no line info. assert(!DI->LexicalBlockStack.empty()); - CGF->Builder.SetCurrentDebugLocation(llvm::DebugLoc::get( - 0, 0, DI->LexicalBlockStack.back(), DI->getInlinedAt())); + CGF->Builder.SetCurrentDebugLocation( + llvm::DILocation::get(DI->LexicalBlockStack.back()->getContext(), 0, 0, + DI->LexicalBlockStack.back(), DI->getInlinedAt())); } ApplyDebugLocation::ApplyDebugLocation(CodeGenFunction &CGF, const Expr *E) @@ -4015,8 +4016,9 @@ void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc) { return; llvm::MDNode *Scope = LexicalBlockStack.back(); - Builder.SetCurrentDebugLocation(llvm::DebugLoc::get( - getLineNumber(CurLoc), getColumnNumber(CurLoc), Scope, CurInlinedAt)); + Builder.SetCurrentDebugLocation( + llvm::DILocation::get(CGM.getLLVMContext(), getLineNumber(CurLoc), + getColumnNumber(CurLoc), Scope, CurInlinedAt)); } void CGDebugInfo::CreateLexicalBlock(SourceLocation Loc) { @@ -4047,9 +4049,9 @@ void CGDebugInfo::EmitLexicalBlockStart(CGBuilderTy &Builder, setLocation(Loc); // Emit a line table change for the current location inside the new scope. - Builder.SetCurrentDebugLocation( - llvm::DebugLoc::get(getLineNumber(Loc), getColumnNumber(Loc), - LexicalBlockStack.back(), CurInlinedAt)); + Builder.SetCurrentDebugLocation(llvm::DILocation::get( + CGM.getLLVMContext(), getLineNumber(Loc), getColumnNumber(Loc), + LexicalBlockStack.back(), CurInlinedAt)); if (DebugKind <= codegenoptions::DebugLineTablesOnly) return; @@ -4260,10 +4262,11 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const VarDecl *VD, Flags | llvm::DINode::FlagArtificial, FieldAlign); // Insert an llvm.dbg.declare into the current block. - DBuilder.insertDeclare( - Storage, D, DBuilder.createExpression(Expr), - llvm::DebugLoc::get(Line, Column, Scope, CurInlinedAt), - Builder.GetInsertBlock()); + DBuilder.insertDeclare(Storage, D, DBuilder.createExpression(Expr), + llvm::DILocation::get(CGM.getLLVMContext(), Line, + Column, Scope, + CurInlinedAt), + Builder.GetInsertBlock()); } } } @@ -4288,7 +4291,8 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const VarDecl *VD, // Insert an llvm.dbg.declare into the current block. DBuilder.insertDeclare(Storage, D, DBuilder.createExpression(Expr), - llvm::DebugLoc::get(Line, Column, Scope, CurInlinedAt), + llvm::DILocation::get(CGM.getLLVMContext(), Line, + Column, Scope, CurInlinedAt), Builder.GetInsertBlock()); return D; @@ -4324,7 +4328,8 @@ void CGDebugInfo::EmitLabel(const LabelDecl *D, CGBuilderTy &Builder) { // Insert an llvm.dbg.label into the current block. DBuilder.insertLabel(L, - llvm::DebugLoc::get(Line, Column, Scope, CurInlinedAt), + llvm::DILocation::get(CGM.getLLVMContext(), Line, Column, + Scope, CurInlinedAt), Builder.GetInsertBlock()); } @@ -4398,8 +4403,8 @@ void CGDebugInfo::EmitDeclareOfBlockDeclRefVariable( Line, Ty, false, llvm::DINode::FlagZero, Align); // Insert an llvm.dbg.declare into the current block. - auto DL = - llvm::DebugLoc::get(Line, Column, LexicalBlockStack.back(), CurInlinedAt); + auto DL = llvm::DILocation::get(CGM.getLLVMContext(), Line, Column, + LexicalBlockStack.back(), CurInlinedAt); auto *Expr = DBuilder.createExpression(addr); if (InsertPoint) DBuilder.insertDeclare(Storage, D, Expr, DL, InsertPoint); @@ -4584,7 +4589,8 @@ void CGDebugInfo::EmitDeclareOfBlockLiteralArgVariable(const CGBlockInfo &block, // Insert an llvm.dbg.declare into the current block. DBuilder.insertDeclare(Alloca, debugVar, DBuilder.createExpression(), - llvm::DebugLoc::get(line, column, scope, CurInlinedAt), + llvm::DILocation::get(CGM.getLLVMContext(), line, + column, scope, CurInlinedAt), Builder.GetInsertBlock()); } @@ -5010,7 +5016,8 @@ llvm::DebugLoc CGDebugInfo::SourceLocToDebugLoc(SourceLocation Loc) { return llvm::DebugLoc(); llvm::MDNode *Scope = LexicalBlockStack.back(); - return llvm::DebugLoc::get(getLineNumber(Loc), getColumnNumber(Loc), Scope); + return llvm::DILocation::get(CGM.getLLVMContext(), getLineNumber(Loc), + getColumnNumber(Loc), Scope); } llvm::DINode::DIFlags CGDebugInfo::getCallSiteRelatedAttrs() const { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
