C++: don't dump global vars without initializers

Author: Robert Marsh

cpp/ql/test/library-tests/ir/ir/PrintConfig.qll

@@ -12,4 +12,11 @@ predicate locationIsInStandardHeaders(Location loc) {
  *
  * This predicate excludes functions defined in standard headers.
  */
-predicate shouldDumpFunction(Function func) { not locationIsInStandardHeaders(func.getLocation()) }
+predicate shouldDumpFunction(Declaration decl) {
+  not locationIsInStandardHeaders(decl.getLocation()) and
+  (
+    not decl instanceof Variable
+    or
+    decl.(GlobalOrNamespaceVariable).hasInitializer()
+  )
+}

cpp/ql/test/library-tests/ir/ir/raw_ir.expected

@@ -139,8 +139,6 @@ bad_asts.cpp:
 #   30|     v30_6(void)         = ExitFunction            : 
 
 clang.cpp:
-#    3| int globalInt
-
 #    5| int* globalIntAddress()
 #    5|   Block 0
 #    5|     v5_1(void)         = EnterFunction              : 
@@ -2226,8 +2224,6 @@ ir.cpp:
 #  341|     v341_11(void)        = AliasedUse               : ~m?
 #  341|     v341_12(void)        = ExitFunction             : 
 
-#  346| int g
-
 #  348| int* AddressOf()
 #  348|   Block 0
 #  348|     v348_1(void)         = EnterFunction            : 
@@ -9016,8 +9012,6 @@ ir.cpp:
 # 1693|     v1693_6(void)       = AliasedUse               : ~m?
 # 1693|     v1693_7(void)       = ExitFunction             : 
 
-# 1699| int global_1
-
 # 1701| int global_2
 # 1701|   Block 0
 # 1701|     v1701_1(void)       = EnterFunction     : 
@@ -9330,8 +9324,6 @@ struct_init.cpp:
 #    9|     v9_9(void)              = AliasedUse                : ~m?
 #    9|     v9_10(void)             = ExitFunction              : 
 
-#   14| Info* global_pointer
-
 #   16| void let_info_escape(Info*)
 #   16|   Block 0
 #   16|     v16_1(void)          = EnterFunction                   : 

cpp/ql/test/library-tests/ir/ir/raw_ir.ql

@@ -8,6 +8,6 @@ private import PrintConfig
 
 private class PrintConfig extends PrintIRConfiguration {
   override predicate shouldPrintFunction(Declaration decl) {
-    shouldDumpFunction(decl) or decl instanceof GlobalOrNamespaceVariable
+    shouldDumpFunction(decl)
   }
 }