codegen: Make sure to initialize static collections

diff --git a/codegen/valaccode.vala b/codegen/valaccode.vala
index 25a0d11af9e642d3f37d6eadd8bbd448d9630b3b..30d196b9e6603df68d040e4f179383969ad7047e 100644 (file)
--- a/codegen/valaccode.vala
+++ b/codegen/valaccode.vala
@@ -26,6 +26,9 @@ namespace Vala {
        static unowned CCodeAttribute get_ccode_attribute (CodeNode node) {
                if (ccode_attribute_cache_index == null) {
                        ccode_attribute_cache_index = CodeNode.get_attribute_cache_index ();
+
+                       // make sure static collections are initialized
+                       CCodeBaseModule.init ();
                }
 
                unowned AttributeCache? attr = node.get_attribute_cache (ccode_attribute_cache_index);

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 12134437334c59fdbdd8194ecae3336f5a7c73a5..c30f0dae9e2e2ab5f8d1f14700ce1dd3a07aba0c 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -405,6 +405,14 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                predefined_marshal_set.add ("VOID:VARIANT");
                predefined_marshal_set.add ("BOOLEAN:BOXED,BOXED");
 
+               init ();
+       }
+
+       public static void init () {
+               if (reserved_identifiers != null) {
+                       return;
+               }
+
                reserved_identifiers = new HashSet<string> (str_hash, str_equal);
 
                // C99 keywords