Change -gheterogeneous-dwarf default to diexpression

Change-Id: Ie1197a704a94725754c1b2f8940639061ce1c554

Author: slinder1

clang/include/clang/Driver/Options.td

@@ -4457,8 +4457,8 @@ def gheterogeneous_dwarf_EQ : Joined<["-"], "gheterogeneous-dwarf=">,
   MarshallingInfoEnum<CodeGenOpts<"HeterogeneousDwarfMode">, "Disabled">;
 def gheterogeneous_dwarf : Flag<["-"], "gheterogeneous-dwarf">, Group<g_Group>,
   Visibility<[ClangOption, CC1Option]>,
-  HelpText<"Enable DIExpr-based DWARF extensions for heterogeneous debugging">,
-  Alias<gheterogeneous_dwarf_EQ>, AliasArgs<["diexpr"]>;
+  HelpText<"Enable DIExpression-based DWARF extensions for heterogeneous debugging">,
+  Alias<gheterogeneous_dwarf_EQ>, AliasArgs<["diexpression"]>;
 def gno_heterogeneous_dwarf : Flag<["-"], "gno-heterogeneous-dwarf">,
   Visibility<[ClangOption, CC1Option]>,
   Group<g_Group>,

clang/lib/Driver/ToolChains/Clang.cpp

@@ -4840,11 +4840,12 @@ renderDebugOptions(const ToolChain &TC, const Driver &D, const llvm::Triple &T,
     assert(Aliased.isValid() && "gheterogeneous-dwarf must be an alias");
     assert(Aliased.getName() == "gheterogeneous-dwarf=" &&
            "gheterogeneous-dwarf must alias gheterogeneous-dwarf=");
-    assert(StringRef(GHeterogeneousDwarf.getAliasArgs()) == "diexpr" &&
-           GHeterogeneousDwarf.getAliasArgs()[strlen("diexpr") + 1] == '\0' &&
-           "gheterogeneous-dwarf must alias gheterogeneous-dwarf=diexpr");
+    assert(StringRef(GHeterogeneousDwarf.getAliasArgs()) == "diexpression" &&
+           GHeterogeneousDwarf.getAliasArgs()[strlen("diexpression") + 1] ==
+               '\0' &&
+           "gheterogeneous-dwarf must alias gheterogeneous-dwarf=diexpression");
 #endif
-    CmdArgs.push_back("-gheterogeneous-dwarf=diexpr");
+    CmdArgs.push_back("-gheterogeneous-dwarf=diexpression");
   }
 
   // This controls whether or not we perform JustMyCode instrumentation.

clang/test/CodeGenHIP/debug-info-cc1-option.hip

@@ -5,8 +5,7 @@
 // and aliases the new default. This is needed for transitioning flang-legacy
 // as it depends on the -cc1 interface.
 
-// CHECK: call void @llvm.dbg.def
-// CHECK: !DIExpr(
+// CHECK: #dbg_declare{{.*}}DIExpression{{.*}}DIOp
 __attribute__((device)) void kernel1(int Arg) {
   int FuncVar;
 }

clang/test/Driver/amdgpu-debug.cl

@@ -7,7 +7,7 @@
 // CHECK-SIMPLE-NOT: "-disable-O0-optnone"
 // CHECK-SIMPLE-NOT: "-debug-info-kind=line-tables-only"
 // CHECK-SIMPLE-DAG: "-mllvm" "-amdgpu-spill-cfi-saved-regs"
-// CHECK-SIMPLE-DAG: "-gheterogeneous-dwarf=diexpr"
+// CHECK-SIMPLE-DAG: "-gheterogeneous-dwarf=diexpression"
 // CHECK-SIMPLE-DAG: "-debugger-tuning=gdb"
 // CHECK-SIMPLE-NOT: "-disable-O0-optnone"
 // CHECK-SIMPLE-NOT: "-debug-info-kind=line-tables-only"
@@ -21,7 +21,7 @@
 // Check that -gheterogeneous-dwarf can be enabled for non-AMDGCN
 // RUN: %clang -### -target x86_64-linux-gnu -x cl -c -nogpuinc -nogpulib  -emit-llvm -gheterogeneous-dwarf %s 2>&1 | FileCheck -check-prefix=CHECK-EXPLICIT-HETEROGENEOUS %s
 // CHECK-EXPLICIT-HETEROGENEOUS: "-cc1"
-// CHECK-EXPLICIT-HETEROGENEOUS: "-gheterogeneous-dwarf=diexpr"
+// CHECK-EXPLICIT-HETEROGENEOUS: "-gheterogeneous-dwarf=diexpression"
 
 // Check that -gheterogeneous-dwarf can be disabled for AMDGCN
 // RUN: %clang -### -target amdgcn-amd-amdhsa -x cl -c -nogpuinc -nogpulib  -emit-llvm -g -gno-heterogeneous-dwarf %s 2>&1 | FileCheck -check-prefix=CHECK-NO-HETEROGENEOUS %s