gingerBill 1 gadu atpakaļ
vecāks
revīzija
bc5b41938e
3 mainītis faili ar 9 papildinājumiem un 4 dzēšanām
  1. 3 2
      src/llvm_backend.cpp
  2. 1 1
      src/llvm_backend.hpp
  3. 5 1
      src/llvm_backend_const.cpp

+ 3 - 2
src/llvm_backend.cpp

@@ -3288,11 +3288,12 @@ gb_internal bool lb_generate_code(lbGenerator *gen) {
 			if (!is_type_any(e->type) && !is_type_union(e->type)) {
 				if (tav.mode != Addressing_Invalid) {
 					if (tav.value.kind != ExactValue_Invalid) {
+						bool is_rodata = e->kind == Entity_Variable && e->Variable.is_rodata;
 						ExactValue v = tav.value;
-						lbValue init = lb_const_value(m, tav.type, v);
+						lbValue init = lb_const_value(m, tav.type, v, false, is_rodata);
 						LLVMSetInitializer(g.value, init.value);
 						var.is_initialized = true;
-						if (e->kind == Entity_Variable && e->Variable.is_rodata) {
+						if (is_rodata) {
 							LLVMSetGlobalConstant(g.value, true);
 						}
 					}

+ 1 - 1
src/llvm_backend.hpp

@@ -398,7 +398,7 @@ gb_internal lbBlock *lb_create_block(lbProcedure *p, char const *name, bool appe
 
 gb_internal lbValue lb_const_nil(lbModule *m, Type *type);
 gb_internal lbValue lb_const_undef(lbModule *m, Type *type);
-gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_local=true);
+gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_local=true, bool is_rodata=false);
 gb_internal lbValue lb_const_bool(lbModule *m, Type *type, bool value);
 gb_internal lbValue lb_const_int(lbModule *m, Type *type, u64 value);
 

+ 5 - 1
src/llvm_backend_const.cpp

@@ -470,7 +470,7 @@ gb_internal bool lb_is_nested_possibly_constant(Type *ft, Selection const &sel,
 	return lb_is_elem_const(elem, ft);
 }
 
-gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_local) {
+gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_local, bool is_rodata) {
 	LLVMContextRef ctx = m->ctx;
 
 	type = default_type(type);
@@ -565,6 +565,10 @@ gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bo
 				array_data = LLVMAddGlobal(m->mod, lb_type(m, t), str);
 				LLVMSetInitializer(array_data, backing_array.value);
 
+				if (is_rodata) {
+					LLVMSetGlobalConstant(array_data, true);
+				}
+
 				lbValue g = {};
 				g.value = array_data;
 				g.type = t;