Adopt suggestion for general case of -gheterogeneous-dwarf

Author: slinder1

clang/lib/Driver/ToolChains/Clang.cpp

@@ -4924,6 +4924,9 @@ renderDebugOptions(const ToolChain &TC, const Driver &D, const llvm::Triple &T,
   if (EmitDwarfForAMDGCN)
     CmdArgs.append({"-mllvm", "-amdgpu-spill-cfi-saved-regs"});
   if (Arg *A = Args.getLastArg(options::OPT_gheterogeneous_dwarf_EQ)) {
+    if (StringRef(A->getValue()) == "diexpr")
+      D.Diag(clang::diag::err_drv_unsupported_opt_with_suggestion)
+          << A->getAsString(Args) << "-gheterogeneous-dwarf=diexpression";
     A->render(Args, CmdArgs);
   } else if (EmitDwarfForAMDGCN) {
 #ifndef NDEBUG

clang/test/Driver/amdgpu-debug.cl

@@ -44,4 +44,15 @@
 
 // Specifically, check for failure with previously-valid value diexpr
 // RUN: not %clang -target amdgcn-amd-amdhsa -x cl -c -nogpuinc -nogpulib  -emit-llvm -g -gheterogeneous-dwarf=diexpr %s 2>&1 | FileCheck -check-prefix=CHECK-DIEXPR %s
-// CHECK-DIEXPR: error: invalid value
+// CHECK-DIEXPR: error: unsupported option '-gheterogeneous-dwarf=diexpr'; did you mean '-gheterogeneous-dwarf=diexpression'?
+
+// Check that =diexpression is implied by -g + spirv
+// RUN: %clang -### -target spirv64-amd-amdhsa -x cl -c -nogpuinc -nogpulib  -emit-llvm -g %s 2>&1 | FileCheck -check-prefix=CHECK-SPIRV %s
+// CHECK-SPIRV: "-cc1"
+// CHECK-SPIRV-DAG: "-mllvm" "-amdgpu-spill-cfi-saved-regs"
+// CHECK-SPIRV-DAG: "-gheterogeneous-dwarf=diexpression"
+// CHECK-SPIRV-DAG: "-debugger-tuning=gdb"
+
+// Check that =diexpr produces an error on spirv.
+// RUN: not %clang -### -target spirv64-amd-amdhsa -x cl -c -nogpuinc -nogpulib  -emit-llvm -g -gheterogeneous-dwarf=diexpr %s 2>&1 | FileCheck -check-prefix=CHECK-SPIRV-ERR %s
+// CHECK-SPIRV-ERR: error: unsupported option '-gheterogeneous-dwarf=diexpr'; did you mean '-gheterogeneous-dwarf=diexpression'?