APP: handle static initializers with local var refs

Author: sipma

chc/app/CDictionary.py

@@ -711,7 +711,7 @@ def index_lval(
             self, lval: CLval, subst: Dict[int, CExp] = {}, fid: int = -1) -> int:
         args: List[int] = [
             self.index_lhost(lval.lhost, subst=subst, fid=fid),
-            self.index_offset(lval.offset)]
+            self.index_offset(lval.offset, fid=fid)]
         return self.mk_lval_index(lval.tags, args)
 
     def index_offset(self, o: COffset, fid: int = -1) -> int:

chc/app/CFileGlobals.py

@@ -370,12 +370,12 @@ def global_varinfo_names(self) -> Dict[str, "CVarInfo"]:
     def global_varinfo_vids(self) -> Dict[int, "CVarInfo"]:
         if self._globalvarinfovids is None:
             self._globalvarinfovids = {}
+            for (vid, gfun) in self.gfunctions.items():
+                self._globalvarinfovids[vid] = gfun.varinfo
             for (vid, vardef) in self.gvardefs.items():
                 self._globalvarinfovids[vid] = vardef.varinfo
             for (vid, vardecl) in self.gvardecls.items():
                 self._globalvarinfovids[vid] = vardecl.varinfo
-            for (vid, gfun) in self.gfunctions.items():
-                self._globalvarinfovids[vid] = gfun.varinfo
         return self._globalvarinfovids
 
     def get_global_varinfos(self) -> List["CVarInfo"]:

chc/app/CGlobalDeclarations.py

@@ -585,14 +585,15 @@ def index_init(self, init: CInitInfo, fid: int = -1) -> int:
 
         if init.is_single:
             init = cast("CSingleInitInfo", init)
-            args = [self.dictionary.index_exp(init.exp)]
+            args = [self.dictionary.index_exp(init.exp, fid=fid)]
             return self.mk_single_init_index(init.tags, args)
 
         if init.is_compound:
             init = cast("CCompoundInitInfo", init)
             gtype = self.dictionary.index_typ(init.typ)
             oinits: List[int] = [
-                self.index_offset_init(x) for x in init.offset_initializers]
+                self.index_offset_init(x, fid=fid)
+                for x in init.offset_initializers]
             args = [gtype] + oinits
             return self.mk_compound_init_index(init.tags, args)
 
@@ -601,8 +602,8 @@ def index_init(self, init: CInitInfo, fid: int = -1) -> int:
 
     def index_offset_init(self, oinit: COffsetInitInfo, fid: int = -1) -> int:
         args: List[int] = [
-            self.dictionary.index_offset(oinit.offset),
-            self.index_init(oinit.initializer)]
+            self.dictionary.index_offset(oinit.offset, fid=fid),
+            self.index_init(oinit.initializer, fid=fid)]
         return self.mk_offset_init_index(oinit.tags, args)
 
     def index_varinfo_vid(self, varref: VarReference) -> Optional[int]:
@@ -631,7 +632,19 @@ def make_global_varinfo(self, fid: int, varinfo: CVarInfo) -> None:
         vtype = self.dictionary.get_typ(vtypeix)
         if varinfo.has_initializer():
             vinit = varinfo.initializer
-            gvinit = [self.index_init(vinit, fid=fid)]
+            try:
+                gvinit = [self.index_init(vinit, fid=fid)]
+            except UF.CHError as e:
+                chklogger.logger.warning(
+                    ("Global variable initializer for %s "
+                     + "(vid: %d, line: %s, fid: %d) "
+                     + " could not be indexed: %s"),
+                    varinfo.vname,
+                    varinfo.vid,
+                    (varinfo.vdecl.line if varinfo.vdecl is not None else -1),
+                    fid,
+                    str(e))
+                gvinit = []
         else:
             gvinit = []
         tags = [vname]
@@ -669,6 +682,15 @@ def f(index: int, tags: List[str], args: List[int]) -> CVarInfo:
             gvarinfo.vname)
 
     def index_file_varinfos(self, fid: int, varinfos: List[CVarInfo]) -> None:
+        chklogger.logger.debug(
+            "Index %d file varinfos for fid: %d (%s)",
+            len(varinfos), fid,
+            ", ".join(v.vname
+                      + "("
+                      + str(v.vid)
+                      + ", line: "
+                      + str(v.line if v.vdecl is not None else "?")
+                      + ")" for v in varinfos))
         if len(varinfos) > 0:
             self.vid2gvid[fid] = {}
             for v in varinfos:

chc/app/CGlobalDictionary.py

@@ -73,7 +73,7 @@ def capp(self) -> "CApplication":
     def decls(self) -> "CGlobalDeclarations":
         return self.capp.declarations
 
-    def index_compinfo_key(self, compinfo, fid):
+    def index_compinfo_key(self, compinfo, fid) -> int:
         chklogger.logger.info(
             "Index compinfo key %s for fid %d", compinfo.name, fid)
         return self.decls.index_compinfo_key(compinfo, fid)