Merge pull request #256 from tjj2017/fix_pr220_regression

Fix PR #220 Regression - Urgent

Author: chrisr-diffblue

experiments/golden-results/StratoX-summary.txt

@@ -134,6 +134,11 @@ Error message: Unsupported pragma: Suppress initialization
 Nkind: N_Pragma
 --
 Occurs: 6 times
+Calling function: Do_Constant
+Error message: Constant Type not in symbol table
+Nkind: N_Integer_Literal
+--
+Occurs: 6 times
 Calling function: Process_Declaration
 Error message: Generic instantiation declaration
 Nkind: N_Procedure_Instantiation
@@ -174,11 +179,6 @@ Error message: Unsupported pragma: Unreferenced
 Nkind: N_Pragma
 --
 Occurs: 4 times
-Calling function: Do_Constant
-Error message: Constant Type not in symbol table
-Nkind: N_Integer_Literal
---
-Occurs: 4 times
 Calling function: Process_Declaration
 Error message: Generic declaration
 Nkind: N_Generic_Package_Declaration
@@ -219,216 +219,6 @@ Error message: Unsupported pragma: Unreferenced
 Nkind: N_Pragma
 --
 Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: generic_types__saturate_mod__min
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: generic_types__saturate_mod__val
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: p4__f1__x
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: spark__arithmetic_lemmas__lemma_mult_scale__res
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: spark__constrained_array_lemmas__lemma_transitive_order__arr
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_quaternions__Oadd__left
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_quaternions__Oadd__right
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_quaternions__Omultiply__left
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_quaternions__Omultiply__right
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_quaternions__Osubtract__left
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_quaternions__conj__left
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__clear__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__empty__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__fill__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__full__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_all__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_back__element
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_back__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_front__element
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_front__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_nth_first__element
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_nth_first__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_nth_last__element
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_nth_last__nth
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__get_nth_last__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__haselements__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__length__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__overflows__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__p_get__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__p_get_all__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__pop_all__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__pop_back__element
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__pop_back__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__pop_front__element
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__pop_front__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__push_back__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__generic_queue__push_front__self
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: system__generic_array_operations__square_matrix_length__a
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: system__generic_c_math_interface__Oexpon__left
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: system__generic_c_math_interface__arccosh__x
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: system__generic_c_math_interface__arccot__x
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: system__generic_c_math_interface__arccoth__x
-Nkind: 
---
-Occurs: 1 times
 Calling function: Process_Declaration
 Error message: Subprogram body stub declaration
 Nkind: N_Subprogram_Body_Stub

experiments/golden-results/muen-summary.txt

@@ -159,36 +159,6 @@ Error message: Exponentiation unhandled for non mod types at the moment
 Nkind: N_Op_Expon
 --
 Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__muchannel__readers__drain__channel
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__muchannel__readers__drain__reader
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__muchannel__writer__deactivate__channel
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__muchannel__writer__initialize__channel
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__muchannel__writer__initialize__epoch
-Nkind: 
---
-Occurs: 1 times
-Calling function: New_Parameter_Symbol_Entry
-Error message: standard__muchannel__writer__write__channel
-Nkind: 
---
-Occurs: 1 times
 Calling function: Process_Declaration
 Error message: Use package clause declaration
 Nkind: N_Use_Package_Clause

gnat2goto/driver/tree_walk.adb

@@ -1192,7 +1192,6 @@ package body Tree_Walk is
    function Do_Defining_Identifier (E : Entity_Id) return Irep is
       Sym          : constant Irep := New_Irep (I_Symbol_Expr);
       Result_Type  : constant Irep := Do_Type_Reference (Etype (E));
-      Sym_Id       : constant Symbol_Id := Intern (Unique_Name (E));
 
       Is_Out_Param : constant Boolean :=
         Ekind (E) in E_In_Out_Parameter | E_Out_Parameter;
@@ -1207,13 +1206,6 @@ package body Tree_Walk is
       Set_Identifier      (Sym, Unique_Name (E));
       Set_Type            (Sym, Symbol_Type);
 
-      if not Global_Symbol_Table.Contains (Sym_Id) then
-         New_Object_Symbol_Entry (Object_Name       => Sym_Id,
-                                  Object_Type       => Symbol_Type,
-                                  Object_Init_Value => Make_Nil (Sloc (E)),
-                                  A_Symbol_Table    => Global_Symbol_Table);
-      end if;
-
       if Is_Out_Param then
          return Deref : constant Irep := New_Irep (I_Dereference_Expr) do
             Set_Type   (Deref, Result_Type);
@@ -4118,9 +4110,7 @@ package body Tree_Walk is
    procedure Do_Subprogram_Body (N : Node_Id) is
       Proc_Name   : constant Symbol_Id :=
         Intern (Unique_Name (Defining_Entity (N)));
-      --  Intern (Unique_Name (Corresponding_Spec (N)));
 
-      Proc_Body   : constant Irep := Do_Subprogram_Or_Block (N);
       Proc_Symbol : Symbol;
    begin
       if not Global_Symbol_Table.Contains (Proc_Name) then
@@ -4140,7 +4130,7 @@ package body Tree_Walk is
       Proc_Symbol := Global_Symbol_Table (Proc_Name);
 
       --  Compile the subprogram body and update its entry in the symbol table.
-      Proc_Symbol.Value := Proc_Body;
+      Proc_Symbol.Value := Do_Subprogram_Or_Block (N);
       Global_Symbol_Table.Replace (Proc_Name, Proc_Symbol);
    end Do_Subprogram_Body;