Merge branch 'topic/more-anonymous-types' into 'master'

Omit names from artificial types See merge request eng/toolchain/gnat-llvm!368

Author: tromey

llvm-interface/gnatllvm-debuginfo.adb

@@ -248,6 +248,13 @@ package body GNATLLVM.DebugInfo is
  function Get_Possibly_Local_Name (E : Entity_Id) return String is
  S : constant Metadata_T := Get_Scope_For (E);
  begin
+ -- Most artificial types should be nameless. The only
+ -- exception here is that there are some types that LLVM does
+ -- not allow to be nameless; these are handled specially at the
+ -- point at which such types are built.
+ if not Comes_From_Source (E) and then Sloc (E) /= Standard_Location then
+ return "";
+ end if;
  if S = No_Metadata_T or not Types_Can_Have_Function_Scope then
  return Get_Name (E);
  end if;
@@ -867,7 +874,9 @@ package body GNATLLVM.DebugInfo is
  E_Index : Opt_N_Is_Index_Id := First_Index (Array_TE);
  begin
  if Is_Unconstrained_Array (Array_TE) then
- return DI_Create_Unspecified_Type (Name);
+ -- LLVM does not allow a nameless unspecified type, so use
+ -- the original name in this instance.
+ return DI_Create_Unspecified_Type (Get_Name (Array_TE));
  end if;
 
  -- For arrays, get the component type's data.
@@ -890,7 +899,9 @@ package body GNATLLVM.DebugInfo is
  Index_Type, High_Bound (E_Range));
  begin
  if Low_Exp = No_Metadata_T or else High_Exp = No_Metadata_T then
- return DI_Create_Unspecified_Type (Name);
+ -- LLVM does not allow a nameless unspecified type, so use
+ -- the original name in this instance.
+ return DI_Create_Unspecified_Type (Get_Name (Array_TE));
  end if;
  if J = 0 and then Component_Size (Array_TE) /= Esize (Comp_TE) then
  Stride := Const_64_As_Metadata (Component_Size (Array_TE));

llvm-interface/gnatllvm-records-debug.adb

@@ -316,23 +316,25 @@ package body GNATLLVM.Records.Debug is
  return Get_Debug_Metadata (Original_Type);
  end if;
 
- -- A type might be self-referential. For example, a
- -- record may have a member whose type refers back to the
- -- same record type. To handle this case, we construct a
- -- empty composite type and record it; then later we
- -- update the members of the type.
+ -- A type might be self-referential. For example, a record may
+ -- have a member whose type refers back to the same record
+ -- type. To handle this case, we construct a empty composite
+ -- type and record it; then later we update the members of the
+ -- type. Note that we pass a unique identifier here; that
+ -- prevents LLVM from reusing an existing type in the case that
+ -- this composite is nameless.
  if Is_Unchecked_Union (TE) then
  Result := DI_Create_Union_Type
  (Debug_Scope, Name,
  Get_Debug_File_Node (Get_Source_File_Index (S)),
  Get_Physical_Line_Number (S), Size, Align, DI_Flag_Zero,
- Empty_Fields, 0, "");
+ Empty_Fields, 0, Name);
  else
  Result := DI_Create_Struct_Type
  (Debug_Scope, Name,
  Get_Debug_File_Node (Get_Source_File_Index (S)),
  Get_Physical_Line_Number (S), Size, Align, DI_Flag_Zero,
- No_Metadata_T, Empty_Fields, 0, No_Metadata_T, "");
+ No_Metadata_T, Empty_Fields, 0, No_Metadata_T, Name);
  end if;
 
  Set_Debug_Metadata (TE, Result);