Address review comments.

Author: abidh

flang/test/Integration/amdgpu/debug-target-var.f90

@@ -1,4 +1,4 @@
-! RUN: %flang_fc1 -triple amdgcn-amd-amdhsa -emit-llvm -fopenmp  -fopenmp-is-target-device -debug-info-kind=standalone %s -o - | FileCheck  %s
+! RUN: %flang_fc1 -triple amdgcn-amd-amdhsa -emit-llvm -fopenmp -fopenmp-is-target-device -debug-info-kind=standalone %s -o - | FileCheck  %s
 
 subroutine fff(x, y)
   implicit none
@@ -12,10 +12,16 @@ subroutine fff(x, y)
 
 end subroutine fff
 
-!CHECK: define{{.*}}amdgpu_kernel void @[[FN:[0-9a-zA_Z_]+]]({{.*}}){{.*}}!dbg ![[SP:[0-9]+]]
-!CHECK: #dbg_declare({{.*}}, ![[X:[0-9]+]], !DIExpression(DIOpArg(0, ptr addrspace(5)), DIOpDeref(ptr), DIOpDeref(ptr)), {{.*}})
-!CHECK: #dbg_declare({{.*}}, ![[Y:[0-9]+]], !DIExpression(DIOpArg(0, ptr addrspace(5)), DIOpDeref(ptr), DIOpDeref(ptr)), {{.*}})
-!CHECK: }
+! CHECK: define{{.*}}amdgpu_kernel void @[[FN:[0-9a-zA_Z_]+]](ptr %0, ptr %[[ARG1:[0-9]+]], ptr %[[ARG2:[0-9]+]]){{.*}}!dbg ![[SP:[0-9]+]]
+! CHECK-DAG: store ptr %[[ARG1]], ptr %[[CAST1:[0-9]+]]{{.*}}
+! CHECK-DAG: %[[CAST1]] = addrspacecast ptr addrspace(5) %[[AL1:[0-9]+]]
+! CHECK-DAG: %[[AL1]] = alloca{{.*}}
+! CHECK-DAG: store ptr %[[ARG2]], ptr %[[CAST2:[0-9]+]]{{.*}}
+! CHECK-DAG: %[[CAST2]] = addrspacecast ptr addrspace(5) %[[AL2:[0-9]+]]
+! CHECK-DAG: %[[AL2]] = alloca{{.*}}
+! CHECK-DAG: #dbg_declare(ptr %[[CAST1]], ![[X:[0-9]+]], !DIExpression(DIOpArg(0, ptr addrspace(5)), DIOpDeref(ptr), DIOpDeref(ptr)), {{.*}})
+! CHECK-DAG: #dbg_declare(ptr %[[CAST2]], ![[Y:[0-9]+]], !DIExpression(DIOpArg(0, ptr addrspace(5)), DIOpDeref(ptr), DIOpDeref(ptr)), {{.*}})
+! CHECK: }
 
 ! CHECK-DAG: ![[SP]] = {{.*}}!DISubprogram(name: "[[FN]]"{{.*}})
 ! CHECK-DAG: ![[X]] = !DILocalVariable(name: "x", arg: 2, scope: ![[SP]]{{.*}}type: ![[INT:[0-9]+]])

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -7037,13 +7037,13 @@ static void FixupDebugInfoForOutlinedFunction(
       // snippet) as location of variable. The AMDGPU backend drops the debug
       // info for variable in such cases. So we change the location to alloca
       // instead.
-      bool passByRef = false;
+      bool PassByRef = false;
       llvm::Type *locType = nullptr;
       for (auto Loc : DR->location_ops()) {
         locType = Loc->getType();
         if (llvm::LoadInst *Load = dyn_cast<llvm::LoadInst>(Loc)) {
           DR->replaceVariableLocationOp(Loc, Load->getPointerOperand());
-          passByRef = true;
+          PassByRef = true;
         }
       }
       // Add DIOps based expression. Note that we generate an extra indirection
@@ -7060,8 +7060,8 @@ static void FixupDebugInfoForOutlinedFunction(
       // This is similar to what clang does.
       // 2. Use double indirection and keep the original type. It will show up
       // in debugger as "x=5". This approached is used here as it is
-      // consisten with the normal fortran parameters display.
-      if (passByRef)
+      // consistent with the normal fortran parameters display.
+      if (PassByRef)
         ExprBuilder.append<llvm::DIOp::Deref>(Builder.getPtrTy(defaultAS));
       ExprBuilder.append<llvm::DIOp::Deref>(locType);
       DR->setExpression(ExprBuilder.intoExpression());