aboutsummaryrefslogtreecommitdiff
path: root/src/ir.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-12-07 13:03:43 -0500
committerAndrew Kelley <andrew@ziglang.org>2019-12-07 13:03:43 -0500
commitedebe0586bd0cb73ef8492fd569e1c2fc7aca05b (patch)
tree18cc72b27a329a10331ceea1777b3df4a51e28bd /src/ir.cpp
parentecb77af5343c58bbd8023ded0ebf241abe1b0dfa (diff)
downloadzig-edebe0586bd0cb73ef8492fd569e1c2fc7aca05b.tar.gz
zig-edebe0586bd0cb73ef8492fd569e1c2fc7aca05b.zip
remove compile error for peer result comptime_int and null
closes #2763
Diffstat (limited to 'src/ir.cpp')
-rw-r--r--src/ir.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ir.cpp b/src/ir.cpp
index 27f69a24da..abf315b797 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -11438,13 +11438,7 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
}
}
} else if (any_are_null && prev_inst->value->type->id != ZigTypeIdNull) {
- if (prev_inst->value->type->id == ZigTypeIdComptimeInt ||
- prev_inst->value->type->id == ZigTypeIdComptimeFloat)
- {
- ir_add_error_node(ira, source_node,
- buf_sprintf("unable to make maybe out of number literal"));
- return ira->codegen->builtin_types.entry_invalid;
- } else if (prev_inst->value->type->id == ZigTypeIdOptional) {
+ if (prev_inst->value->type->id == ZigTypeIdOptional) {
return prev_inst->value->type;
} else {
if ((err = type_resolve(ira->codegen, prev_inst->value->type, ResolveStatusSizeKnown)))