authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-02-05 20:49:14-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-02-05 20:49:14-05:00
log28f63b8a4f2e55d2596a0e3daea106500a479791
tree4ceb95b0d8a5c8de8cdf00929fbe6ace3d749131
parentd26bb3ae2e9add11ef350e5d7b040dfbe10539be

fix volatile not respected for storing through a struct pointer

2 files changed, 25 insertions(+), 17 deletions(-)

src/all_types.hpp+1
......@@ -1740,6 +1740,7 @@ struct IrInstructionVarPtr {
17401740
17411741 VariableTableEntry *var;
17421742 bool is_const;
1743 bool is_volatile;
17431744};
17441745
17451746struct IrInstructionCall {
src/ir.cpp+24-17
......@@ -770,11 +770,12 @@ static IrInstruction *ir_build_bin_op_from(IrBuilder *irb, IrInstruction *old_in
770770}
771771
772772static IrInstruction *ir_build_var_ptr(IrBuilder *irb, Scope *scope, AstNode *source_node,
773 VariableTableEntry *var, bool is_const)
773 VariableTableEntry *var, bool is_const, bool is_volatile)
774774{
775775 IrInstructionVarPtr *instruction = ir_build_instruction<IrInstructionVarPtr>(irb, scope, source_node);
776776 instruction->var = var;
777777 instruction->is_const = is_const;
778 instruction->is_volatile = is_volatile;
778779
779780 ir_ref_var(var);
780781
......@@ -782,10 +783,10 @@ static IrInstruction *ir_build_var_ptr(IrBuilder *irb, Scope *scope, AstNode *so
782783}
783784
784785static IrInstruction *ir_build_var_ptr_from(IrBuilder *irb, IrInstruction *old_instruction,
785 VariableTableEntry *var, bool is_const)
786 VariableTableEntry *var, bool is_const, bool is_volatile)
786787{
787788 IrInstruction *new_instruction = ir_build_var_ptr(irb, old_instruction->scope,
788 old_instruction->source_node, var, is_const);
789 old_instruction->source_node, var, is_const, is_volatile);
789790 ir_link_new_instruction(new_instruction, old_instruction);
790791 return new_instruction;
791792
......@@ -3599,7 +3600,8 @@ static IrInstruction *ir_gen_decl_ref(IrBuilder *irb, AstNode *source_node, Tld
35993600 {
36003601 TldVar *tld_var = (TldVar *)tld;
36013602 VariableTableEntry *var = tld_var->var;
3602 IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, source_node, var, !lval.is_ptr || lval.is_const);
3603 IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, source_node, var,
3604 !lval.is_ptr || lval.is_const, lval.is_ptr && lval.is_volatile);
36033605 if (lval.is_ptr)
36043606 return var_ptr;
36053607 else
......@@ -3648,7 +3650,7 @@ static IrInstruction *ir_gen_symbol(IrBuilder *irb, Scope *scope, AstNode *node,
36483650 VariableTableEntry *var = find_variable(irb->codegen, scope, variable_name);
36493651 if (var) {
36503652 IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, node, var,
3651 !lval.is_ptr || lval.is_const);
3653 !lval.is_ptr || lval.is_const, lval.is_ptr && lval.is_volatile);
36523654 if (lval.is_ptr)
36533655 return var_ptr;
36543656 else
......@@ -4584,7 +4586,7 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, Scope *parent_scope, AstNo
45844586
45854587 IrInstruction *undefined_value = ir_build_const_undefined(irb, child_scope, elem_node);
45864588 ir_build_var_decl(irb, child_scope, elem_node, elem_var, elem_var_type, undefined_value);
4587 IrInstruction *elem_var_ptr = ir_build_var_ptr(irb, child_scope, node, elem_var, false);
4589 IrInstruction *elem_var_ptr = ir_build_var_ptr(irb, child_scope, node, elem_var, false, false);
45884590
45894591 AstNode *index_var_source_node;
45904592 VariableTableEntry *index_var;
......@@ -4602,7 +4604,7 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, Scope *parent_scope, AstNo
46024604 IrInstruction *zero = ir_build_const_usize(irb, child_scope, node, 0);
46034605 IrInstruction *one = ir_build_const_usize(irb, child_scope, node, 1);
46044606 ir_build_var_decl(irb, child_scope, index_var_source_node, index_var, usize, zero);
4605 IrInstruction *index_ptr = ir_build_var_ptr(irb, child_scope, node, index_var, false);
4607 IrInstruction *index_ptr = ir_build_var_ptr(irb, child_scope, node, index_var, false, false);
46064608
46074609
46084610 IrBasicBlock *cond_block = ir_build_basic_block(irb, child_scope, "ForCond");
......@@ -8678,7 +8680,7 @@ static TypeTableEntry *ir_analyze_instruction_phi(IrAnalyze *ira, IrInstructionP
86788680}
86798681
86808682static TypeTableEntry *ir_analyze_var_ptr(IrAnalyze *ira, IrInstruction *instruction,
8681 VariableTableEntry *var, bool is_const_ptr, bool depends_on_compile_var)
8683 VariableTableEntry *var, bool is_const_ptr, bool is_volatile_ptr, bool depends_on_compile_var)
86828684{
86838685 assert(var->value.type);
86848686 if (var->value.type->id == TypeTableEntryIdInvalid)
......@@ -8697,14 +8699,15 @@ static TypeTableEntry *ir_analyze_var_ptr(IrAnalyze *ira, IrInstruction *instruc
86978699 mem_slot = &ira->exec_context.mem_slot_list[var->mem_slot_index];
86988700 }
86998701
8702 bool is_const = (var->value.type->id == TypeTableEntryIdMetaType) ? is_const_ptr : var->src_is_const;
8703 bool is_volatile = (var->value.type->id == TypeTableEntryIdMetaType) ? is_volatile_ptr : false;
87008704 if (mem_slot && mem_slot->special != ConstValSpecialRuntime) {
87018705 ConstPtrSpecial ptr_special = is_comptime ? ConstPtrSpecialInline : ConstPtrSpecialNone;
8702 bool is_const = (var->value.type->id == TypeTableEntryIdMetaType) ? is_const_ptr : var->src_is_const;
87038706 depends_on_compile_var = mem_slot->depends_on_compile_var || depends_on_compile_var || is_comptime;
87048707 return ir_analyze_const_ptr(ira, instruction, mem_slot, var->value.type,
8705 depends_on_compile_var, ptr_special, is_const, false);
8708 depends_on_compile_var, ptr_special, is_const, is_volatile);
87068709 } else {
8707 ir_build_var_ptr_from(&ira->new_irb, instruction, var, false);
8710 ir_build_var_ptr_from(&ira->new_irb, instruction, var, is_const, is_volatile);
87088711 type_ensure_zero_bits_known(ira->codegen, var->value.type);
87098712 return get_pointer_to_type(ira->codegen, var->value.type, var->src_is_const);
87108713 }
......@@ -8712,7 +8715,8 @@ static TypeTableEntry *ir_analyze_var_ptr(IrAnalyze *ira, IrInstruction *instruc
87128715
87138716static TypeTableEntry *ir_analyze_instruction_var_ptr(IrAnalyze *ira, IrInstructionVarPtr *var_ptr_instruction) {
87148717 VariableTableEntry *var = var_ptr_instruction->var;
8715 return ir_analyze_var_ptr(ira, &var_ptr_instruction->base, var, var_ptr_instruction->is_const, false);
8718 return ir_analyze_var_ptr(ira, &var_ptr_instruction->base, var, var_ptr_instruction->is_const,
8719 var_ptr_instruction->is_volatile, false);
87168720}
87178721
87188722static VariableTableEntry *get_fn_var_by_index(FnTableEntry *fn_entry, size_t index) {
......@@ -8784,12 +8788,15 @@ static TypeTableEntry *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstruc
87848788 VariableTableEntry *var = get_fn_var_by_index(fn_entry, abs_index);
87858789 bool depends_on_compile_var = array_ptr->value.depends_on_compile_var ||
87868790 elem_index->value.depends_on_compile_var;
8791 bool is_const = true;
8792 bool is_volatile = false;
87878793 if (var) {
8788 return ir_analyze_var_ptr(ira, &elem_ptr_instruction->base, var, true, depends_on_compile_var);
8794 return ir_analyze_var_ptr(ira, &elem_ptr_instruction->base, var,
8795 is_const, is_volatile, depends_on_compile_var);
87898796 } else {
87908797 return ir_analyze_const_ptr(ira, &elem_ptr_instruction->base, &ira->codegen->const_void_val,
87918798 ira->codegen->builtin_types.entry_void, depends_on_compile_var, ConstPtrSpecialNone,
8792 true, false);
8799 is_const, is_volatile);
87938800 }
87948801 } else {
87958802 ir_add_error_node(ira, elem_ptr_instruction->base.source_node,
......@@ -8981,7 +8988,7 @@ static TypeTableEntry *ir_analyze_decl_ref(IrAnalyze *ira, IrInstruction *source
89818988 {
89828989 TldVar *tld_var = (TldVar *)tld;
89838990 VariableTableEntry *var = tld_var->var;
8984 return ir_analyze_var_ptr(ira, source_instruction, var, false, depends_on_compile_var);
8991 return ir_analyze_var_ptr(ira, source_instruction, var, false, false, depends_on_compile_var);
89858992 }
89868993 case TldIdFn:
89878994 {
......@@ -12296,12 +12303,12 @@ FnTableEntry *ir_create_inline_fn(CodeGen *codegen, Buf *fn_name, VariableTableE
1229612303 // Entry block gets a reference because we enter it to begin.
1229712304 ir_ref_bb(irb->current_basic_block);
1229812305
12299 IrInstruction *maybe_fn_ptr = ir_build_var_ptr(irb, scope, source_node, var, true);
12306 IrInstruction *maybe_fn_ptr = ir_build_var_ptr(irb, scope, source_node, var, true, false);
1230012307 IrInstruction *unwrapped_fn_ptr = ir_build_unwrap_maybe(irb, scope, source_node, maybe_fn_ptr, true);
1230112308 IrInstruction *fn_ref_instruction = ir_build_load_ptr(irb, scope, source_node, unwrapped_fn_ptr);
1230212309
1230312310 for (size_t i = 0; i < arg_count; i += 1) {
12304 IrInstruction *var_ptr_instruction = ir_build_var_ptr(irb, scope, source_node, arg_vars[i], true);
12311 IrInstruction *var_ptr_instruction = ir_build_var_ptr(irb, scope, source_node, arg_vars[i], true, false);
1230512312 args[i] = ir_build_load_ptr(irb, scope, source_node, var_ptr_instruction);
1230612313 }
1230712314