Browse Source

Ignore `ir_emit_byte_swap` for constant values

gingerBill 6 years ago
parent
commit
304c7594cd
2 changed files with 17 additions and 2 deletions
  1. 14 2
      src/checker.cpp
  2. 3 0
      src/ir.cpp

+ 14 - 2
src/checker.cpp

@@ -1812,11 +1812,23 @@ void init_core_source_code_location(Checker *c) {
 
 void init_core_map_type(Checker *c) {
 	if (t_map_key == nullptr) {
-		t_map_key = find_core_type(c, str_lit("Map_Key"));
+		Entity *e = find_core_entity(c, str_lit("Map_Key"));
+		if (e->state == EntityState_Unresolved) {
+			auto ctx = c->init_ctx;
+			check_entity_decl(&ctx, e, nullptr, nullptr);
+		}
+		t_map_key = e->type;
+		GB_ASSERT(t_map_key != nullptr);
 	}
 
 	if (t_map_header == nullptr) {
-		t_map_header = find_core_type(c, str_lit("Map_Header"));
+		Entity *e = find_core_entity(c, str_lit("Map_Header"));
+		if (e->state == EntityState_Unresolved) {
+			auto ctx = c->init_ctx;
+			check_entity_decl(&ctx, e, nullptr, nullptr);
+		}
+		t_map_header = e->type;
+		GB_ASSERT(t_map_header != nullptr);
 	}
 }
 

+ 3 - 0
src/ir.cpp

@@ -4372,6 +4372,9 @@ irValue *ir_emit_uintptr_to_ptr(irProcedure *proc, irValue *value, Type *t) {
 
 irValue *ir_emit_byte_swap(irProcedure *proc, irValue *value, Type *t) {
 	Type *vt = core_type(ir_type(value));
+	if (is_type_untyped(vt)) {
+		return value;
+	}
 	GB_ASSERT(type_size_of(vt) == type_size_of(t));
 	return ir_emit(proc, ir_instr_conv(proc, irConv_byteswap, value, vt, t));
 }