From fc147a40d83670c63d75cd22f95a2d017270d2c6 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sun, 14 Sep 2014 04:44:13 +0200
Subject: Fix crash on resolver functions using secondary stack.

---
 translate/grt/grt-unithread.ads |  5 ++++-
 translate/translation.adb       | 12 +++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'translate')

diff --git a/translate/grt/grt-unithread.ads b/translate/grt/grt-unithread.ads
index cc8a176b9..b35b7be33 100644
--- a/translate/grt/grt-unithread.ads
+++ b/translate/grt/grt-unithread.ads
@@ -46,7 +46,10 @@ package Grt.Unithread is
    procedure Set_Current_Process (Proc : Process_Acc);
    function Get_Current_Process return Process_Acc;
 
-   --  The secondary stack for the thread.
+   --  The secondary stack for the thread.  In this implementation, there is
+   --  only one secondary stack, shared by all processes. This is allowed,
+   --  because a wait statement cannot appear within a function.  So at a wait
+   --  statement, the secondary stack must be empty.
    function Get_Stack2 return Stack2_Ptr;
    procedure Set_Stack2 (St : Stack2_Ptr);
 
diff --git a/translate/translation.adb b/translate/translation.adb
index 857f4564a..a68c787b7 100644
--- a/translate/translation.adb
+++ b/translate/translation.adb
@@ -10810,7 +10810,7 @@ package body Translation is
          Data : Read_Source_Data;
       begin
          if Rinfo = null then
-            --  Not resolver for this function
+            --  No resolver for this function
             return;
          end if;
 
@@ -10962,6 +10962,10 @@ package body Translation is
          end if;
 
          --  Call the resolution function.
+         if Finfo.Use_Stack2 then
+            Create_Temp_Stack2_Mark;
+         end if;
+
          Start_Association (Assoc, Finfo.Ortho_Func);
          if Finfo.Res_Interface /= O_Dnode_Null then
             New_Association (Assoc, M2E (Res));
@@ -13593,14 +13597,12 @@ package body Translation is
       function Translate_Static_Aggregate (Aggr : Iir)
                                           return O_Cnode
       is
-         Aggr_Type : Iir;
-         El_Type : Iir;
+         Aggr_Type : constant Iir := Get_Type (Aggr);
+         El_Type : constant Iir := Get_Element_Subtype (Aggr_Type);
          List : O_Array_Aggr_List;
          Res : O_Cnode;
       begin
-         Aggr_Type := Get_Type (Aggr);
          Chap3.Translate_Anonymous_Type_Definition (Aggr_Type, True);
-         El_Type := Get_Element_Subtype (Aggr_Type);
          Start_Array_Aggr (List, Get_Ortho_Type (Aggr_Type, Mode_Value));
 
          Translate_Static_Aggregate_1
-- 
cgit v1.2.3