Fix TODO in lower_context_for_call

Author: nickg

src/lower.c

@@ -2417,13 +2417,8 @@ static vcode_type_t lower_param_type(type_t type, class_t class,
 
 static vcode_reg_t lower_context_for_call(lower_unit_t *lu, ident_t unit_name)
 {
-   // XXX: this should call unit_registery_get_parent
-   if (lu->registry != NULL && unit_registry_query(lu->registry, unit_name)) {
-      vcode_unit_t vu = unit_registry_get(lu->registry, unit_name);
-
-      vcode_unit_t context = vcode_unit_context(vu);
-      assert(context != NULL);
-
+   vcode_unit_t context = unit_registry_get_parent(lu->registry, unit_name);
+   if (context != NULL) {
       vcode_unit_t ancestor = lu->vunit;
       int hops = 0;
       for (; ancestor && ancestor != context;

test/regress/gold/cover1.xml

@@ -109,14 +109,23 @@
       <scope name="PROC_CALL_LOCAL" line="105">
         <statement hier="WORK.COVER1.TEST_PROC.PROC_CALL_LOCAL" data="1"/>
       </scope>
+      <scope name="_S3" line="106">
+        <statement hier="WORK.COVER1.TEST_PROC._S3" data="1"/>
+      </scope>
+      <scope name="_S4" line="107">
+        <statement hier="WORK.COVER1.TEST_PROC._S4" data="1"/>
+      </scope>
+      <scope name="_S5" line="109">
+        <statement hier="WORK.COVER1.TEST_PROC._S5" data="1"/>
+      </scope>
+      <scope name="_S6" line="111">
+        <statement hier="WORK.COVER1.TEST_PROC._S6" data="1"/>
+      </scope>
       <scope name="MY_LOCAL_PROCEDURE" line="30">
         <scope name="RPT3" line="32">
           <statement hier="WORK.COVER1.TEST_PROC.MY_LOCAL_PROCEDURE.RPT3" data="1"/>
         </scope>
       </scope>
-      <scope name="_S3" line="106">
-        <statement hier="WORK.COVER1.TEST_PROC._S3" data="1"/>
-      </scope>
       <scope name="MY_LOCAL_FUNCTION" line="35">
         <scope name="RPT4" line="37">
           <statement hier="WORK.COVER1.TEST_PROC.MY_LOCAL_FUNCTION.RPT4" data="2"/>
@@ -135,15 +144,6 @@
           </scope>
         </scope>
       </scope>
-      <scope name="_S4" line="107">
-        <statement hier="WORK.COVER1.TEST_PROC._S4" data="1"/>
-      </scope>
-      <scope name="_S5" line="109">
-        <statement hier="WORK.COVER1.TEST_PROC._S5" data="1"/>
-      </scope>
-      <scope name="_S6" line="111">
-        <statement hier="WORK.COVER1.TEST_PROC._S6" data="1"/>
-      </scope>
     </scope>
     <scope name="MY_GLOBAL_PROCEDURE" line="8">
       <scope name="RPT1" line="10">

test/regress/gold/cover15.xml

@@ -8,6 +8,24 @@
       <scope name="_S1" line="19">
         <statement hier="WORK.COVER15._P0._S1" data="1"/>
       </scope>
+      <scope name="_S2" line="20">
+        <statement hier="WORK.COVER15._P0._S2" data="1"/>
+      </scope>
+      <scope name="_S3" line="21">
+        <statement hier="WORK.COVER15._P0._S3" data="1"/>
+      </scope>
+      <scope name="_S4" line="22">
+        <statement hier="WORK.COVER15._P0._S4" data="1"/>
+      </scope>
+      <scope name="_S5" line="23">
+        <statement hier="WORK.COVER15._P0._S5" data="1"/>
+      </scope>
+      <scope name="_S6" line="25">
+        <statement hier="WORK.COVER15._P0._S6" data="1"/>
+      </scope>
+      <scope name="_S7" line="26">
+        <statement hier="WORK.COVER15._P0._S7" data="1"/>
+      </scope>
       <scope name="CROP_AND_SATURATE_TIME" line="9">
         <scope name="_S0" line="11">
           <statement hier="WORK.COVER15._P0.CROP_AND_SATURATE_TIME._S0" data="3"/>
@@ -54,24 +72,6 @@
           </scope>
         </scope>
       </scope>
-      <scope name="_S2" line="20">
-        <statement hier="WORK.COVER15._P0._S2" data="1"/>
-      </scope>
-      <scope name="_S3" line="21">
-        <statement hier="WORK.COVER15._P0._S3" data="1"/>
-      </scope>
-      <scope name="_S4" line="22">
-        <statement hier="WORK.COVER15._P0._S4" data="1"/>
-      </scope>
-      <scope name="_S5" line="23">
-        <statement hier="WORK.COVER15._P0._S5" data="1"/>
-      </scope>
-      <scope name="_S6" line="25">
-        <statement hier="WORK.COVER15._P0._S6" data="1"/>
-      </scope>
-      <scope name="_S7" line="26">
-        <statement hier="WORK.COVER15._P0._S7" data="1"/>
-      </scope>
     </scope>
   </scope>
 </scope>