From e45b3d5dad003d71da8df2692bf11c5c1f429434 Mon Sep 17 00:00:00 2001 From: Yaxun Liu Date: Tue, 24 Oct 2017 19:14:43 +0000 Subject: [PATCH] CodeGen: Fix missing debug loc due to alloca Builder save/restores insertion pointer when emitting addr space cast for alloca, but does not save/restore debug loc, which causes verifier failure for certain call instructions. This patch fixes that. Differential Revision: https://reviews.llvm.org/D39069 llvm-svn: 316484 --- clang/lib/CodeGen/CGExpr.cpp | 3 +-- clang/test/CodeGenOpenCL/func-call-dbg-loc.cl | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 clang/test/CodeGenOpenCL/func-call-dbg-loc.cl diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 2eb6d0a..6837377 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -74,12 +74,11 @@ Address CodeGenFunction::CreateTempAlloca(llvm::Type *Ty, CharUnits Align, // cast alloca to the default address space when necessary. if (CastToDefaultAddrSpace && getASTAllocaAddressSpace() != LangAS::Default) { auto DestAddrSpace = getContext().getTargetAddressSpace(LangAS::Default); - auto CurIP = Builder.saveIP(); + llvm::IRBuilderBase::InsertPointGuard IPG(Builder); Builder.SetInsertPoint(AllocaInsertPt); V = getTargetHooks().performAddrSpaceCast( *this, V, getASTAllocaAddressSpace(), LangAS::Default, Ty->getPointerTo(DestAddrSpace), /*non-null*/ true); - Builder.restoreIP(CurIP); } return Address(V, Align); diff --git a/clang/test/CodeGenOpenCL/func-call-dbg-loc.cl b/clang/test/CodeGenOpenCL/func-call-dbg-loc.cl new file mode 100644 index 0000000..4ed082f --- /dev/null +++ b/clang/test/CodeGenOpenCL/func-call-dbg-loc.cl @@ -0,0 +1,18 @@ +// RUN: %clang_cc1 -triple amdgcn---amdgizcl -debug-info-kind=limited -O0 -emit-llvm -o - %s | FileCheck %s + +typedef struct +{ + int a; +} Struct; + +Struct func1(); + +void func2(Struct S); + +void func3() +{ + // CHECK: call i32 @func1() #{{[0-9]+}}, !dbg ![[LOC:[0-9]+]] + // CHECK: call void @func2(i32 %{{[0-9]+}}) #{{[0-9]+}}, !dbg ![[LOC]] + func2(func1()); +} + -- 2.7.4