mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 00:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

add concept of inline for, inline while, inline var

Browse Source
This commit is contained in:
Andrew Kelley 2016-11-03 14:13:57 -04:00
parent 1a0111d4c3
commit c8333d0cc9
8 changed files with 217 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/langref.md
View File

@ -15,7 +15,7 @@ ErrorValueDecl = "error" Symbol ";"
GlobalVarDecl = VariableDeclaration ";"
VariableDeclaration = ("var" | "const") Symbol option(":" TypeExpr) "=" Expression
VariableDeclaration = option("inline") ("var" | "const") Symbol option(":" TypeExpr) "=" Expression
ContainerDecl = ("struct" | "enum" | "union") Symbol option(ParamDeclList) "{" many(StructMember) "}"
@ -79,9 +79,9 @@ SwitchProng = (list(SwitchItem, ",") | "else") "=>" option("|" Symbol "|") Expre
SwitchItem = Expression | (Expression "..." Expression)
WhileExpression = "while" "(" Expression option(";" Expression) ")" Expression
WhileExpression = option("inline") "while" "(" Expression option(";" Expression) ")" Expression
ForExpression = "for" "(" Expression ")" option("|" option("*") Symbol option("," Symbol) "|") Expression
ForExpression = option("inline") "for" "(" Expression ")" option("|" option("*") Symbol option("," Symbol) "|") Expression
BoolOrExpression = BoolAndExpression "||" BoolOrExpression | BoolAndExpression

14
src/all_types.hpp
View File

@ -301,6 +301,7 @@ struct AstNodeVariableDeclaration {
TopLevelDecl top_level_decl;
Buf *symbol;
bool is_const;
bool is_inline;
bool is_extern;
// one or both of type and expr will be non null
AstNode *type;
@ -522,6 +523,7 @@ struct AstNodeWhileExpr {
AstNode *condition;
AstNode *continue_expr;
AstNode *body;
bool is_inline;
// populated by semantic analyzer
bool condition_always_true;
@ -536,6 +538,7 @@ struct AstNodeForExpr {
AstNode *index_node; // always a symbol, might be null
AstNode *body;
bool elem_is_ptr;
bool is_inline;
// populated by semantic analyzer
bool contains_break;
@ -1337,7 +1340,9 @@ struct VariableTableEntry {
Buf name;
TypeTableEntry *type;
LLVMValueRef value_ref;
bool is_const;
bool src_is_const;
bool gen_is_const;
bool is_inline;
// which node is the declaration of the variable
AstNode *decl_node;
// which node contains the ConstExprValue for this variable's value
@ -1457,6 +1462,10 @@ struct IrInstruction {
size_t ref_count;
IrInstruction *other;
ReturnKnowledge return_knowledge;
// if this is true, this instruction should not cause compile errors.
// for example, we can write to a variable with src_is_const true but
// gen_is_const false.
bool gen_only;
};
struct IrInstructionCondBr {
@ -1465,12 +1474,14 @@ struct IrInstructionCondBr {
IrInstruction *condition;
IrBasicBlock *then_block;
IrBasicBlock *else_block;
bool is_inline;
};
struct IrInstructionBr {
IrInstruction base;
IrBasicBlock *dest_block;
bool is_inline;
};
struct IrInstructionSwitchBrCase {
@ -1485,6 +1496,7 @@ struct IrInstructionSwitchBr {
IrBasicBlock *else_block;
size_t case_count;
IrInstructionSwitchBrCase *cases;
bool is_inline;
};
struct IrInstructionPhi {

9
src/analyze.cpp
View File

@ -3026,7 +3026,7 @@ static bool var_is_pure(VariableTableEntry *var, BlockContext *context) {
// variable was declared in the current function, so it's OK.
return true;
}
return var->is_const && var->type->deep_const;
return var->src_is_const && var->type->deep_const;
}
static TypeTableEntry *analyze_var_ref(CodeGen *g, AstNode *source_node, VariableTableEntry *var,
@ -3036,7 +3036,7 @@ static TypeTableEntry *analyze_var_ref(CodeGen *g, AstNode *source_node, Variabl
if (!var_is_pure(var, context)) {
mark_impure_fn(g, context, source_node);
}
if (var->is_const && var->val_node) {
if (var->src_is_const && var->val_node) {
ConstExprValue *other_const_val = &get_resolved_expr(var->val_node)->const_val;
if (other_const_val->ok) {
return resolve_expr_const_val_as_other_expr(g, source_node, var->val_node,
@ -3188,7 +3188,7 @@ static TypeTableEntry *analyze_lvalue(CodeGen *g, ImportTableEntry *import, Bloc
Buf *name = lhs_node->data.symbol_expr.symbol;
VariableTableEntry *var = find_variable(g, block_context, name);
if (var) {
if (var->is_const) {
if (var->src_is_const) {
add_node_error(g, lhs_node, buf_sprintf("cannot assign to constant"));
expected_rhs_type = g->builtin_types.entry_invalid;
} else {
@ -3736,7 +3736,8 @@ static VariableTableEntry *add_local_var_shadowable(CodeGen *g, AstNode *source_
context->fn_entry->variable_list.append(variable_entry);
}
variable_entry->is_const = is_const;
variable_entry->src_is_const = is_const;
variable_entry->gen_is_const = is_const;
variable_entry->decl_node = source_node;
variable_entry->val_node = val_node;

6
src/codegen.cpp
View File

@ -4105,7 +4105,7 @@ static void build_all_basic_blocks(CodeGen *g, FnTableEntry *fn) {
static void gen_global_var(CodeGen *g, VariableTableEntry *var, LLVMValueRef init_val,
TypeTableEntry *type_entry)
{
assert(var->is_const);
assert(var->gen_is_const);
assert(var->import);
assert(type_entry);
bool is_local_to_unit = true;
@ -4183,12 +4183,12 @@ static void do_code_gen(CodeGen *g) {
LLVMSetUnnamedAddr(global_value, true);
// TODO debug info for function pointers
if (var->is_const && var->type->id != TypeTableEntryIdFn) {
if (var->gen_is_const && var->type->id != TypeTableEntryIdFn) {
gen_global_var(g, var, init_val, var->type);
}
}
LLVMSetGlobalConstant(global_value, var->is_const);
LLVMSetGlobalConstant(global_value, var->gen_is_const);
var->value_ref = global_value;
}

177
src/ir.cpp
View File

@ -200,6 +200,7 @@ static T *ir_create_instruction(IrExecutable *exec, AstNode *source_node) {
template<typename T>
static T *ir_build_instruction(IrBuilder *irb, AstNode *source_node) {
assert(source_node);
T *special_instruction = ir_create_instruction<T>(irb->exec, source_node);
ir_instruction_append(irb->current_basic_block, &special_instruction->base);
return special_instruction;
@ -220,7 +221,7 @@ static IrInstruction *ir_build_cast(IrBuilder *irb, AstNode *source_node, IrInst
}
static IrInstruction *ir_build_cond_br(IrBuilder *irb, AstNode *source_node, IrInstruction *condition,
IrBasicBlock *then_block, IrBasicBlock *else_block)
IrBasicBlock *then_block, IrBasicBlock *else_block, bool is_inline)
{
IrInstructionCondBr *cond_br_instruction = ir_build_instruction<IrInstructionCondBr>(irb, source_node);
cond_br_instruction->base.type_entry = irb->codegen->builtin_types.entry_unreachable;
@ -228,6 +229,7 @@ static IrInstruction *ir_build_cond_br(IrBuilder *irb, AstNode *source_node, IrI
cond_br_instruction->condition = condition;
cond_br_instruction->then_block = then_block;
cond_br_instruction->else_block = else_block;
cond_br_instruction->is_inline = is_inline;
ir_ref_instruction(condition);
ir_ref_bb(then_block);
@ -237,10 +239,10 @@ static IrInstruction *ir_build_cond_br(IrBuilder *irb, AstNode *source_node, IrI
}
static IrInstruction *ir_build_cond_br_from(IrBuilder *irb, IrInstruction *old_instruction,
IrInstruction *condition, IrBasicBlock *then_block, IrBasicBlock *else_block)
IrInstruction *condition, IrBasicBlock *then_block, IrBasicBlock *else_block, bool is_inline)
{
IrInstruction *new_instruction = ir_build_cond_br(irb, old_instruction->source_node,
condition, then_block, else_block);
condition, then_block, else_block, is_inline);
ir_link_new_instruction(new_instruction, old_instruction);
return new_instruction;
}
@ -517,22 +519,23 @@ static IrInstruction *ir_build_phi_from(IrBuilder *irb, IrInstruction *old_instr
return new_instruction;
}
static IrInstruction *ir_build_br(IrBuilder *irb, AstNode *source_node, IrBasicBlock *dest_block) {
static IrInstruction *ir_build_br(IrBuilder *irb, AstNode *source_node, IrBasicBlock *dest_block, bool is_inline) {
IrInstructionBr *br_instruction = ir_build_instruction<IrInstructionBr>(irb, source_node);
br_instruction->base.type_entry = irb->codegen->builtin_types.entry_unreachable;
br_instruction->base.static_value.ok = true;
br_instruction->dest_block = dest_block;
br_instruction->is_inline = is_inline;
ir_ref_bb(dest_block);
return &br_instruction->base;
}
//static IrInstruction *ir_build_br_from(IrBuilder *irb, IrInstruction *old_instruction, IrBasicBlock *dest_block) {
// IrInstruction *new_instruction = ir_build_br(irb, old_instruction->source_node, dest_block);
// ir_link_new_instruction(new_instruction, old_instruction);
// return new_instruction;
//}
static IrInstruction *ir_build_br_from(IrBuilder *irb, IrInstruction *old_instruction, IrBasicBlock *dest_block) {
IrInstruction *new_instruction = ir_build_br(irb, old_instruction->source_node, dest_block, false);
ir_link_new_instruction(new_instruction, old_instruction);
return new_instruction;
}
static IrInstruction *ir_build_un_op(IrBuilder *irb, AstNode *source_node, IrUnOp op_id, IrInstruction *value) {
IrInstructionUnOp *br_instruction = ir_build_instruction<IrInstructionUnOp>(irb, source_node);
@ -634,7 +637,7 @@ static IrInstruction *ir_build_var_decl(IrBuilder *irb, AstNode *source_node,
decl_var_instruction->var_type = var_type;
decl_var_instruction->init_value = init_value;
ir_ref_instruction(var_type);
if (var_type) ir_ref_instruction(var_type);
ir_ref_instruction(init_value);
return &decl_var_instruction->base;
@ -775,13 +778,14 @@ static void ir_set_cursor_at_end(IrBuilder *irb, IrBasicBlock *basic_block) {
}
static VariableTableEntry *add_local_var(CodeGen *codegen, AstNode *node, BlockContext *scope,
Buf *name, bool is_const, bool is_shadowable)
Buf *name, bool src_is_const, bool gen_is_const, bool is_shadowable, bool is_inline)
{
VariableTableEntry *variable_entry = allocate<VariableTableEntry>(1);
variable_entry->block_context = scope;
variable_entry->import = node->owner;
variable_entry->shadowable = is_shadowable;
variable_entry->mem_slot_index = SIZE_MAX;
variable_entry->is_inline = is_inline;
if (name) {
buf_init_from_buf(&variable_entry->name, name);
@ -817,7 +821,8 @@ static VariableTableEntry *add_local_var(CodeGen *codegen, AstNode *node, BlockC
buf_init_from_str(&variable_entry->name, "_anon");
}
variable_entry->is_const = is_const;
variable_entry->src_is_const = src_is_const;
variable_entry->gen_is_const = gen_is_const;
variable_entry->decl_node = node;
return variable_entry;
@ -825,10 +830,12 @@ static VariableTableEntry *add_local_var(CodeGen *codegen, AstNode *node, BlockC
// Set name to nullptr to make the variable anonymous (not visible to programmer).
static VariableTableEntry *ir_add_local_var(IrBuilder *irb, AstNode *node, BlockContext *scope, Buf *name,
bool is_const, bool is_shadowable)
bool src_is_const, bool gen_is_const, bool is_shadowable, bool is_inline)
{
VariableTableEntry *var = add_local_var(irb->codegen, node, scope, name, is_const, is_shadowable);
var->mem_slot_index = exec_next_mem_slot(irb->exec);
VariableTableEntry *var = add_local_var(irb->codegen, node, scope, name,
src_is_const, gen_is_const, is_shadowable, is_inline);
if (is_inline || gen_is_const)
var->mem_slot_index = exec_next_mem_slot(irb->exec);
return var;
}
@ -1189,14 +1196,14 @@ static IrInstruction *ir_gen_if_bool_expr(IrBuilder *irb, AstNode *node) {
IrBasicBlock *else_block = ir_build_basic_block(irb, "Else");
IrBasicBlock *endif_block = ir_build_basic_block(irb, "EndIf");
ir_build_cond_br(irb, condition->source_node, condition, then_block, else_block);
ir_build_cond_br(irb, condition->source_node, condition, then_block, else_block, false);
ir_set_cursor_at_end(irb, then_block);
IrInstruction *then_expr_result = ir_gen_node(irb, then_node, node->block_context);
if (then_expr_result == irb->codegen->invalid_instruction)
return then_expr_result;
IrBasicBlock *after_then_block = irb->current_basic_block;
ir_build_br(irb, node, endif_block);
ir_build_br(irb, node, endif_block, false);
ir_set_cursor_at_end(irb, else_block);
IrInstruction *else_expr_result;
@ -1208,7 +1215,7 @@ static IrInstruction *ir_gen_if_bool_expr(IrBuilder *irb, AstNode *node) {
else_expr_result = ir_build_const_void(irb, node);
}
IrBasicBlock *after_else_block = irb->current_basic_block;
ir_build_br(irb, node, endif_block);
ir_build_br(irb, node, endif_block, false);
ir_set_cursor_at_end(irb, endif_block);
IrInstruction **incoming_values = allocate<IrInstruction *>(2);
@ -1333,8 +1340,9 @@ static IrInstruction *ir_gen_var_decl(IrBuilder *irb, AstNode *node) {
bool is_shadowable = false;
bool is_const = variable_declaration->is_const;
bool is_extern = variable_declaration->is_extern;
bool is_inline = variable_declaration->is_inline;
VariableTableEntry *var = ir_add_local_var(irb, node, node->block_context,
variable_declaration->symbol, is_const, is_shadowable);
variable_declaration->symbol, is_const, is_const, is_shadowable, is_inline);
if (!is_extern && !variable_declaration->expr) {
var->type = irb->codegen->builtin_types.entry_invalid;
@ -1356,18 +1364,18 @@ static IrInstruction *ir_gen_while_expr(IrBuilder *irb, AstNode *node) {
ir_build_basic_block(irb, "WhileContinue") : cond_block;
IrBasicBlock *end_block = ir_build_basic_block(irb, "WhileEnd");
ir_build_br(irb, node, cond_block);
bool is_inline = node->data.while_expr.is_inline;
ir_build_br(irb, node, cond_block, is_inline);
if (continue_expr_node) {
ir_set_cursor_at_end(irb, continue_block);
ir_gen_node(irb, continue_expr_node, node->block_context);
ir_build_br(irb, node, cond_block);
ir_build_br(irb, node, cond_block, is_inline);
}
ir_set_cursor_at_end(irb, cond_block);
IrInstruction *cond_val = ir_gen_node(irb, node->data.while_expr.condition, node->block_context);
ir_build_cond_br(irb, node->data.while_expr.condition, cond_val, body_block, end_block);
ir_build_cond_br(irb, node->data.while_expr.condition, cond_val, body_block, end_block, is_inline);
ir_set_cursor_at_end(irb, body_block);
@ -1377,7 +1385,7 @@ static IrInstruction *ir_gen_while_expr(IrBuilder *irb, AstNode *node) {
irb->break_block_stack.pop();
irb->continue_block_stack.pop();
ir_build_br(irb, node, continue_block);
ir_build_br(irb, node, continue_block, is_inline);
ir_set_cursor_at_end(irb, end_block);
return ir_build_const_void(irb, node);
@ -1411,30 +1419,36 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, AstNode *node) {
} else {
elem_var_type = ir_build_ptr_type_child(irb, elem_node, pointer_type);
}
bool is_inline = node->data.for_expr.is_inline;
BlockContext *child_scope = new_block_context(node, parent_scope);
child_scope->parent_loop_node = node;
elem_node->block_context = child_scope;
// TODO make it an error to write to element variable or i variable.
Buf *elem_var_name = elem_node->data.symbol_expr.symbol;
node->data.for_expr.elem_var = ir_add_local_var(irb, elem_node, child_scope, elem_var_name, false, false);
node->data.for_expr.elem_var = ir_add_local_var(irb, elem_node, child_scope, elem_var_name,
true, false, false, is_inline);
IrInstruction *undefined_value = ir_build_const_undefined(irb, elem_node);
ir_build_var_decl(irb, elem_node, node->data.for_expr.elem_var, elem_var_type, undefined_value);
IrInstruction *elem_var_ptr = ir_build_var_ptr(irb, node, node->data.for_expr.elem_var);
AstNode *index_var_source_node;
if (index_node) {
index_var_source_node = index_node;
Buf *index_var_name = index_node->data.symbol_expr.symbol;
index_node->block_context = child_scope;
node->data.for_expr.index_var = ir_add_local_var(irb, index_node, child_scope, index_var_name, false, false);
node->data.for_expr.index_var = ir_add_local_var(irb, index_node, child_scope, index_var_name,
true, false, false, is_inline);
} else {
node->data.for_expr.index_var = ir_add_local_var(irb, node, child_scope, nullptr, false, true);
index_var_source_node = node;
node->data.for_expr.index_var = ir_add_local_var(irb, node, child_scope, nullptr,
true, false, true, is_inline);
}
IrInstruction *usize = ir_build_const_type(irb, node, irb->codegen->builtin_types.entry_usize);
IrInstruction *zero = ir_build_const_usize(irb, node, 0);
IrInstruction *one = ir_build_const_usize(irb, node, 1);
ir_build_var_decl(irb, index_node, node->data.for_expr.index_var, usize, zero);
ir_build_var_decl(irb, index_var_source_node, node->data.for_expr.index_var, usize, zero);
IrInstruction *index_ptr = ir_build_var_ptr(irb, node, node->data.for_expr.index_var);
@ -1444,12 +1458,12 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, AstNode *node) {
IrBasicBlock *continue_block = ir_build_basic_block(irb, "ForContinue");
IrInstruction *len_val = ir_build_read_field(irb, node, array_val, irb->codegen->len_buf);
ir_build_br(irb, node, cond_block);
ir_build_br(irb, node, cond_block, is_inline);
ir_set_cursor_at_end(irb, cond_block);
IrInstruction *index_val = ir_build_load_ptr(irb, node, index_ptr);
IrInstruction *cond = ir_build_bin_op(irb, node, IrBinOpCmpLessThan, index_val, len_val);
ir_build_cond_br(irb, node, cond, body_block, end_block);
ir_build_cond_br(irb, node, cond, body_block, end_block, is_inline);
ir_set_cursor_at_end(irb, body_block);
IrInstruction *elem_ptr = ir_build_elem_ptr(irb, node, array_val, index_val);
@ -1467,12 +1481,12 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, AstNode *node) {
irb->break_block_stack.pop();
irb->continue_block_stack.pop();
ir_build_br(irb, node, continue_block);
ir_build_br(irb, node, continue_block, is_inline);
ir_set_cursor_at_end(irb, continue_block);
IrInstruction *new_index_val = ir_build_bin_op(irb, node, IrBinOpAdd, index_val, one);
ir_build_store_ptr(irb, node, index_ptr, new_index_val);
ir_build_br(irb, node, cond_block);
ir_build_br(irb, node, cond_block, is_inline);
ir_set_cursor_at_end(irb, end_block);
return ir_build_const_void(irb, node);
@ -1911,23 +1925,41 @@ static void ir_inline_bb(IrAnalyze *ira, IrBasicBlock *old_bb) {
}
static ConstExprValue *ir_get_out_val(IrInstruction *instruction) {
instruction->other = instruction;
return &instruction->static_value;
static ConstExprValue *ir_build_const_from(IrAnalyze *ira, IrInstruction *old_instruction,
bool depends_on_compile_var)
{
IrInstruction *new_instruction;
if (old_instruction->id == IrInstructionIdVarPtr) {
IrInstructionVarPtr *old_var_ptr_instruction = (IrInstructionVarPtr *)old_instruction;
IrInstructionVarPtr *var_ptr_instruction = ir_create_instruction<IrInstructionVarPtr>(ira->new_irb.exec,
old_instruction->source_node);
var_ptr_instruction->var = old_var_ptr_instruction->var;
new_instruction = &var_ptr_instruction->base;
} else if (old_instruction->id == IrInstructionIdFieldPtr) {
zig_panic("TODO");
} else if (old_instruction->id == IrInstructionIdElemPtr) {
zig_panic("TODO");
} else {
IrInstructionConst *const_instruction = ir_create_instruction<IrInstructionConst>(ira->new_irb.exec,
old_instruction->source_node);
new_instruction = &const_instruction->base;
}
ir_link_new_instruction(new_instruction, old_instruction);
ConstExprValue *const_val = &new_instruction->static_value;
const_val->ok = true;
const_val->depends_on_compile_var = depends_on_compile_var;
return const_val;
}
static TypeTableEntry *ir_analyze_void(IrAnalyze *ira, IrInstruction *instruction) {
ConstExprValue *const_val = ir_get_out_val(instruction);
const_val->ok = true;
ir_build_const_from(ira, instruction, false);
return ira->codegen->builtin_types.entry_void;
}
static TypeTableEntry *ir_analyze_const_usize(IrAnalyze *ira, IrInstruction *instruction, uint64_t value,
bool depends_on_compile_var)
{
ConstExprValue *const_val = ir_get_out_val(instruction);
const_val->ok = true;
const_val->depends_on_compile_var = depends_on_compile_var;
ConstExprValue *const_val = ir_build_const_from(ira, instruction, depends_on_compile_var);
bignum_init_unsigned(&const_val->data.x_bignum, value);
return ira->codegen->builtin_types.entry_usize;
}
@ -2295,7 +2327,8 @@ static TypeTableEntry *ir_analyze_bin_op_bool(IrAnalyze *ira, IrInstructionBinOp
ConstExprValue *op1_val = &casted_op1->static_value;
ConstExprValue *op2_val = &casted_op2->static_value;
if (op1_val->ok && op2_val->ok) {
ConstExprValue *out_val = ir_get_out_val(&bin_op_instruction->base);
bool depends_on_compile_var = op1_val->depends_on_compile_var || op2_val->depends_on_compile_var;
ConstExprValue *out_val = ir_build_const_from(ira, &bin_op_instruction->base, depends_on_compile_var);
assert(op1->type_entry->id == TypeTableEntryIdBool);
assert(op2->type_entry->id == TypeTableEntryIdBool);
@ -2306,14 +2339,10 @@ static TypeTableEntry *ir_analyze_bin_op_bool(IrAnalyze *ira, IrInstructionBinOp
} else {
zig_unreachable();
}
out_val->ok = true;
out_val->depends_on_compile_var = op1_val->depends_on_compile_var ||
op2_val->depends_on_compile_var;
return bool_type;
}
ir_build_bin_op_from(&ira->new_irb, &bin_op_instruction->base, bin_op_instruction->op_id, op1->other, op2->other);
return bool_type;
}
@ -2425,9 +2454,8 @@ static TypeTableEntry *ir_analyze_bin_op_cmp(IrAnalyze *ira, IrInstructionBinOp
}
}
ConstExprValue *out_val = ir_get_out_val(&bin_op_instruction->base);
out_val->ok = true;
out_val->depends_on_compile_var = op1_val->depends_on_compile_var || op2_val->depends_on_compile_var;
bool depends_on_compile_var = op1_val->depends_on_compile_var || op2_val->depends_on_compile_var;
ConstExprValue *out_val = ir_build_const_from(ira, &bin_op_instruction->base, depends_on_compile_var);
out_val->data.x_bool = answer;
return ira->codegen->builtin_types.entry_bool;
}
@ -4108,12 +4136,15 @@ static TypeTableEntry *ir_analyze_instruction_br(IrAnalyze *ira, IrInstructionBr
// TODO detect backward jumps
ir_inline_bb(ira, old_dest_block);
return ira->codegen->builtin_types.entry_unreachable;
if (br_instruction->is_inline || old_dest_block->ref_count == 1) {
ir_inline_bb(ira, old_dest_block);
return ira->codegen->builtin_types.entry_unreachable;
}
//IrBasicBlock *new_bb = ir_get_new_bb(ira, old_dest_block);
//ir_build_br_from(&ira->new_irb, &br_instruction->base, new_bb);
//return ira->codegen->builtin_types.entry_unreachable;
IrBasicBlock *new_bb = ir_get_new_bb(ira, old_dest_block);
ir_build_br_from(&ira->new_irb, &br_instruction->base, new_bb);
ir_finish_bb(ira);
return ira->codegen->builtin_types.entry_unreachable;
}
static TypeTableEntry *ir_analyze_instruction_cond_br(IrAnalyze *ira, IrInstructionCondBr *cond_br_instruction) {
@ -4129,13 +4160,20 @@ static TypeTableEntry *ir_analyze_instruction_cond_br(IrAnalyze *ira, IrInstruct
IrBasicBlock *old_dest_block = condition->static_value.data.x_bool ?
cond_br_instruction->then_block : cond_br_instruction->else_block;
ir_inline_bb(ira, old_dest_block);
if (cond_br_instruction->is_inline || old_dest_block->ref_count == 1) {
ir_inline_bb(ira, old_dest_block);
return ira->codegen->builtin_types.entry_unreachable;
}
} else if (cond_br_instruction->is_inline) {
add_node_error(ira->codegen, condition->source_node,
buf_sprintf("unable to evaluate constant expression"));
ir_finish_bb(ira);
return ira->codegen->builtin_types.entry_unreachable;
}
IrBasicBlock *new_then_block = ir_get_new_bb(ira, cond_br_instruction->then_block);
IrBasicBlock *new_else_block = ir_get_new_bb(ira, cond_br_instruction->else_block);
ir_build_cond_br_from(&ira->new_irb, &cond_br_instruction->base, condition, new_then_block, new_else_block);
ir_build_cond_br_from(&ira->new_irb, &cond_br_instruction->base, condition, new_then_block, new_else_block, false);
ir_finish_bb(ira);
return ira->codegen->builtin_types.entry_unreachable;
}
@ -4206,7 +4244,8 @@ static TypeTableEntry *ir_analyze_instruction_phi(IrAnalyze *ira, IrInstructionP
IrInstruction *value = phi_instruction->incoming_values[i]->other;
assert(value->type_entry);
if (value->static_value.ok) {
ConstExprValue *out_val = ir_get_out_val(&phi_instruction->base);
ConstExprValue *out_val = ir_build_const_from(ira, &phi_instruction->base,
value->static_value.depends_on_compile_var);
*out_val = value->static_value;
} else {
phi_instruction->base.other = value;
@ -4259,9 +4298,9 @@ static TypeTableEntry *ir_analyze_instruction_var_ptr(IrAnalyze *ira, IrInstruct
if (var->mem_slot_index != SIZE_MAX) {
ConstExprValue *mem_slot = &ira->exec_context.mem_slot_list[var->mem_slot_index];
if (mem_slot->ok) {
ConstExprValue *out_val = ir_get_out_val(&var_ptr_instruction->base);
ConstExprValue *out_val = ir_build_const_from(ira, &var_ptr_instruction->base,
mem_slot->depends_on_compile_var);
out_val->ok = true;
out_val->data.x_ptr.len = 1;
out_val->data.x_ptr.is_c_str = false;
out_val->data.x_ptr.ptr = allocate<ConstExprValue *>(1);
@ -4477,7 +4516,8 @@ static TypeTableEntry *ir_analyze_instruction_load_ptr(IrAnalyze *ira, IrInstruc
if (ptr->static_value.ok) {
ConstExprValue *pointee = ptr->static_value.data.x_ptr.ptr[0];
if (pointee->ok) {
ConstExprValue *out_val = ir_get_out_val(&load_ptr_instruction->base);
ConstExprValue *out_val = ir_build_const_from(ira, &load_ptr_instruction->base,
pointee->depends_on_compile_var);
*out_val = *pointee;
return child_type;
}
@ -4576,8 +4616,7 @@ static TypeTableEntry *ir_analyze_instruction_typeof(IrAnalyze *ira, IrInstructi
case TypeTableEntryIdFn:
case TypeTableEntryIdTypeDecl:
{
ConstExprValue *out_val = ir_get_out_val(&typeof_instruction->base);
out_val->ok = true;
ConstExprValue *out_val = ir_build_const_from(ira, &typeof_instruction->base, false);
// TODO depends_on_compile_var should be set based on whether the type of the expression
// depends_on_compile_var. but we currently don't have a thing to tell us if the type of
// something depends on a compile var
@ -4609,9 +4648,8 @@ static TypeTableEntry *ir_analyze_instruction_to_ptr_type(IrAnalyze *ira,
return ira->codegen->builtin_types.entry_invalid;
}
ConstExprValue *out_val = ir_get_out_val(&to_ptr_type_instruction->base);
out_val->ok = true;
out_val->depends_on_compile_var = type_value->static_value.depends_on_compile_var;
ConstExprValue *out_val = ir_build_const_from(ira, &to_ptr_type_instruction->base,
type_value->static_value.depends_on_compile_var);
out_val->data.x_type = ptr_type;
return ira->codegen->builtin_types.entry_type;
}
@ -4630,9 +4668,8 @@ static TypeTableEntry *ir_analyze_instruction_ptr_type_child(IrAnalyze *ira,
return ira->codegen->builtin_types.entry_invalid;
}
ConstExprValue *out_val = ir_get_out_val(&ptr_type_child_instruction->base);
out_val->ok = true;
out_val->depends_on_compile_var = type_value->static_value.depends_on_compile_var;
ConstExprValue *out_val = ir_build_const_from(ira, &ptr_type_child_instruction->base,
type_value->static_value.depends_on_compile_var);
out_val->data.x_type = type_entry->data.pointer.child_type;
return ira->codegen->builtin_types.entry_type;
}
@ -4734,10 +4771,6 @@ TypeTableEntry *ir_analyze(CodeGen *codegen, IrExecutable *old_exec, IrExecutabl
while (ira->block_queue_index < ira->old_bb_queue.length) {
IrInstruction *old_instruction = ira->old_irb.current_basic_block->instruction_list.at(ira->instruction_index);
fprintf(stderr, "===%zu====", old_instruction->debug_id);
ir_print(stderr, ira->new_irb.exec, 4);
fprintf(stderr, "========");
if (old_instruction->ref_count == 0 && !ir_has_side_effects(old_instruction)) {
ira->instruction_index += 1;
continue;

13
src/ir_print.cpp
View File

@ -231,14 +231,15 @@ static void ir_print_bin_op(IrPrint *irp, IrInstructionBinOp *bin_op_instruction
}
static void ir_print_decl_var(IrPrint *irp, IrInstructionDeclVar *decl_var_instruction) {
const char *var_or_const = decl_var_instruction->var->is_const ? "const" : "var";
const char *inline_kw = decl_var_instruction->var->is_inline ? "inline " : "";
const char *var_or_const = decl_var_instruction->var->gen_is_const ? "const" : "var";
const char *name = buf_ptr(&decl_var_instruction->var->name);
if (decl_var_instruction->var_type) {
fprintf(irp->f, "%s %s: ", var_or_const, name);
fprintf(irp->f, "%s%s %s: ", inline_kw, var_or_const, name);
ir_print_other_instruction(irp, decl_var_instruction->var_type);
fprintf(irp->f, " = ");
} else {
fprintf(irp->f, "%s %s = ", var_or_const, name);
fprintf(irp->f, "%s%s %s = ", inline_kw, var_or_const, name);
}
ir_print_other_instruction(irp, decl_var_instruction->init_value);
}
@ -275,7 +276,8 @@ static void ir_print_builtin_call(IrPrint *irp, IrInstructionBuiltinCall *call_i
static void ir_print_cond_br(IrPrint *irp, IrInstructionCondBr *cond_br_instruction) {
fprintf(irp->f, "if (");
const char *inline_kw = cond_br_instruction->is_inline ? "inline " : "";
fprintf(irp->f, "%sif (", inline_kw);
ir_print_other_instruction(irp, cond_br_instruction->condition);
fprintf(irp->f, ") ");
ir_print_other_block(irp, cond_br_instruction->then_block);
@ -284,7 +286,8 @@ static void ir_print_cond_br(IrPrint *irp, IrInstructionCondBr *cond_br_instruct
}
static void ir_print_br(IrPrint *irp, IrInstructionBr *br_instruction) {
fprintf(irp->f, "goto ");
const char *inline_kw = br_instruction->is_inline ? "inline " : "";
fprintf(irp->f, "%sgoto ", inline_kw);
ir_print_other_block(irp, br_instruction->dest_block);
}

87
src/parser.cpp
View File

@ -1450,29 +1450,50 @@ static AstNode *ast_parse_defer_expr(ParseContext *pc, size_t *token_index) {
}
/*
VariableDeclaration : ("var" | "const") "Symbol" ("=" Expression | ":" PrefixOpExpression option("=" Expression))
VariableDeclaration = option("inline") ("var" | "const") Symbol option(":" TypeExpr) "=" Expression
*/
static AstNode *ast_parse_variable_declaration_expr(ParseContext *pc, size_t *token_index, bool mandatory,
VisibMod visib_mod)
{
Token *first_token = &pc->tokens->at(*token_index);
Token *var_token;
bool is_const;
bool is_inline;
if (first_token->id == TokenIdKeywordInline) {
is_inline = true;
var_token = &pc->tokens->at(*token_index + 1);
if (first_token->id == TokenIdKeywordVar) {
if (var_token->id == TokenIdKeywordVar) {
is_const = false;
} else if (var_token->id == TokenIdKeywordConst) {
is_const = true;
} else if (mandatory) {
ast_invalid_token_error(pc, var_token);
} else {
return nullptr;
}
*token_index += 2;
} else if (first_token->id == TokenIdKeywordVar) {
is_inline = false;
is_const = false;
var_token = first_token;
*token_index += 1;
} else if (first_token->id == TokenIdKeywordConst) {
is_inline = false;
is_const = true;
var_token = first_token;
*token_index += 1;
} else if (mandatory) {
ast_invalid_token_error(pc, first_token);
} else {
return nullptr;
}
*token_index += 1;
AstNode *node = ast_create_node(pc, NodeTypeVariableDeclaration, first_token);
AstNode *node = ast_create_node(pc, NodeTypeVariableDeclaration, var_token);
node->data.variable_declaration.is_inline = is_inline;
node->data.variable_declaration.is_const = is_const;
node->data.variable_declaration.top_level_decl.visib_mod = visib_mod;
@ -1529,21 +1550,33 @@ static AstNode *ast_parse_bool_or_expr(ParseContext *pc, size_t *token_index, bo
}
/*
WhileExpression = "while" "(" Expression option(";" Expression) ")" Expression
WhileExpression = option("inline") "while" "(" Expression option(";" Expression) ")" Expression
*/
static AstNode *ast_parse_while_expr(ParseContext *pc, size_t *token_index, bool mandatory) {
Token *token = &pc->tokens->at(*token_index);
Token *first_token = &pc->tokens->at(*token_index);
Token *while_token;
if (token->id != TokenIdKeywordWhile) {
if (mandatory) {
ast_expect_token(pc, token, TokenIdKeywordWhile);
bool is_inline;
if (first_token->id == TokenIdKeywordInline) {
is_inline = true;
while_token = &pc->tokens->at(*token_index + 1);
if (while_token->id == TokenIdKeywordWhile) {
*token_index += 2;
} else if (mandatory) {
ast_expect_token(pc, first_token, TokenIdKeywordWhile);
} else {
return nullptr;
}
} else if (first_token->id == TokenIdKeywordWhile) {
is_inline = false;
*token_index += 1;
} else if (mandatory) {
ast_expect_token(pc, first_token, TokenIdKeywordWhile);
} else {
return nullptr;
}
*token_index += 1;
AstNode *node = ast_create_node(pc, NodeTypeWhileExpr, token);
AstNode *node = ast_create_node(pc, NodeTypeWhileExpr, while_token);
node->data.while_expr.is_inline = is_inline;
ast_eat_token(pc, token_index, TokenIdLParen);
node->data.while_expr.condition = ast_parse_expression(pc, token_index, true);
@ -1575,21 +1608,35 @@ static AstNode *ast_parse_symbol(ParseContext *pc, size_t *token_index) {
}
/*
ForExpression = "for" "(" Expression ")" option("|" option("*") "Symbol" option("," "Symbol") "|") Expression
ForExpression = option("inline") "for" "(" Expression ")" option("|" option("*") Symbol option("," Symbol) "|") Expression
*/
static AstNode *ast_parse_for_expr(ParseContext *pc, size_t *token_index, bool mandatory) {
Token *token = &pc->tokens->at(*token_index);
Token *first_token = &pc->tokens->at(*token_index);
Token *for_token;
if (token->id != TokenIdKeywordFor) {
if (mandatory) {
ast_expect_token(pc, token, TokenIdKeywordFor);
bool is_inline;
if (first_token->id == TokenIdKeywordInline) {
is_inline = true;
for_token = &pc->tokens->at(*token_index + 1);
if (for_token->id == TokenIdKeywordFor) {
*token_index += 2;
} else if (mandatory) {
ast_expect_token(pc, first_token, TokenIdKeywordFor);
} else {
return nullptr;
}
} else if (first_token->id == TokenIdKeywordFor) {
for_token = first_token;
is_inline = false;
*token_index += 1;
} else if (mandatory) {
ast_expect_token(pc, first_token, TokenIdKeywordFor);
} else {
return nullptr;
}
*token_index += 1;
AstNode *node = ast_create_node(pc, NodeTypeForExpr, token);
AstNode *node = ast_create_node(pc, NodeTypeForExpr, for_token);
node->data.for_expr.is_inline = is_inline;
ast_eat_token(pc, token_index, TokenIdLParen);
node->data.for_expr.array_expr = ast_parse_expression(pc, token_index, true);

13
test/self_hosted2.zig Normal file
View File

@ -0,0 +1,13 @@
fn add(a: i32, b: i32) -> i32 {
a + b
}
fn assert(ok: bool) {
if (!ok) @unreachable();
}
fn testAdd() {
@setFnTest(this, true);
assert(add(2, 3) == 5);
}