From c584456a21f81a7927939e26d84fa661d10eceae Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Sun, 8 Mar 2020 10:43:00 +0000
Subject: [PATCH] Fix logical binary expressions

---
 examples/demo/demo.odin |  8 ++++----
 src/llvm_backend.cpp    | 20 ++++++++++----------
 src/llvm_backend.hpp    |  3 +--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/examples/demo/demo.odin b/examples/demo/demo.odin
index 601f1b27a..da56c9e64 100644
--- a/examples/demo/demo.odin
+++ b/examples/demo/demo.odin
@@ -1934,7 +1934,7 @@ union_maybe :: proc() {
 main :: proc() {
 	when true {
 		the_basics();
-		// control_flow();
+		control_flow();
 		named_proc_return_parameters();
 		explicit_procedure_overloading();
 		struct_type();
@@ -1943,13 +1943,13 @@ main :: proc() {
 		// implicit_context_system();
 		parametric_polymorphism();
 		array_programming();
-		// map_type();
-		// implicit_selector_expression();
+		map_type();
+		implicit_selector_expression();
 		partial_switch();
 		cstring_example();
 		bit_set_type();
 		deferred_procedure_associations();
-		// reflection();
+		reflection();
 		quaternions();
 		inline_for_statement();
 		where_clauses();
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp
index 4b16a2d3c..d98a20aac 100644
--- a/src/llvm_backend.cpp
+++ b/src/llvm_backend.cpp
@@ -2923,7 +2923,7 @@ lbValue lb_emit_logical_binary_expr(lbProcedure *p, TokenKind op, Ast *left, Ast
 	GB_ASSERT(incoming_values.count == incoming_blocks.count);
 	LLVMAddIncoming(res.value, incoming_values.data, incoming_blocks.data, cast(unsigned)incoming_values.count);
 
-	return short_circuit;
+	return res;
 }
 
 
@@ -4603,7 +4603,6 @@ lbValue lb_build_binary_expr(lbProcedure *p, Ast *expr) {
 	case Token_CmpAnd:
 	case Token_CmpOr:
 		return lb_emit_logical_binary_expr(p, be->op.kind, be->left, be->right, tv.type);
-		break;
 
 	case Token_in:
 	case Token_not_in:
@@ -8074,6 +8073,7 @@ lbValue lb_gen_map_header(lbProcedure *p, lbValue map_val_ptr, Type *map_type) {
 	gbAllocator a = heap_allocator();
 	lbAddr h = lb_add_local_generated(p, t_map_header, false); // all the values will be initialzed later
 	map_type = base_type(map_type);
+	GB_ASSERT(map_type->kind == Type_Map);
 
 	Type *key_type = map_type->Map.key;
 	Type *val_type = map_type->Map.value;
@@ -8127,8 +8127,7 @@ lbValue lb_gen_map_key(lbProcedure *p, lbValue key, Type *key_type) {
 		lbValue str = lb_emit_conv(p, key, t_string);
 		lbValue hashed_str = {};
 
-		if (lb_is_const(str)) {
-
+		if (false && lb_is_const(str)) {
 			String value = lb_get_const_string(p->module, str);
 			u64 hs = fnv64a(value.text, value.len);
 			hashed_str = lb_const_value(p->module, t_u64, exact_value_u64(hs));
@@ -8146,23 +8145,24 @@ lbValue lb_gen_map_key(lbProcedure *p, lbValue key, Type *key_type) {
 	return lb_addr_load(p, v);
 }
 
-lbValue lb_insert_dynamic_map_key_and_value(lbProcedure *p, lbAddr addr, Type *map_type,
-                                            lbValue map_key, lbValue map_value) {
+void lb_insert_dynamic_map_key_and_value(lbProcedure *p, lbAddr addr, Type *map_type,
+                                         lbValue map_key, lbValue map_value) {
 	map_type = base_type(map_type);
+	GB_ASSERT(map_type->kind == Type_Map);
 
 	lbValue h = lb_gen_map_header(p, addr.addr, map_type);
 	lbValue key = lb_gen_map_key(p, map_key, map_type->Map.key);
 	lbValue v = lb_emit_conv(p, map_value, map_type->Map.value);
 
-	lbAddr ptr = lb_add_local_generated(p, v.type, false);
-	lb_addr_store(p, ptr, v);
+	lbAddr value_addr = lb_add_local_generated(p, v.type, false);
+	lb_addr_store(p, value_addr, v);
 
 	auto args = array_make<lbValue>(heap_allocator(), 4);
 	args[0] = h;
 	args[1] = key;
-	args[2] = lb_emit_conv(p, ptr.addr, t_rawptr);
+	args[2] = lb_emit_conv(p, value_addr.addr, t_rawptr);
 	args[3] = lb_emit_source_code_location(p, nullptr);
-	return lb_emit_runtime_call(p, "__dynamic_map_set", args);
+	lb_emit_runtime_call(p, "__dynamic_map_set", args);
 }
 
 
diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp
index 5e91d2efc..3a532f195 100644
--- a/src/llvm_backend.hpp
+++ b/src/llvm_backend.hpp
@@ -310,7 +310,6 @@ void lb_emit_increment(lbProcedure *p, lbValue addr);
 
 lbValue lb_type_info(lbModule *m, Type *type);
 
-lbValue lb_insert_dynamic_map_key_and_value(lbProcedure *p, lbAddr addr, Type *map_type, lbValue map_key, lbValue map_value);
 
 
 bool lb_is_const(lbValue value);
@@ -320,7 +319,7 @@ String lb_get_const_string(lbModule *m, lbValue value);
 lbValue lb_generate_array(lbModule *m, Type *elem_type, i64 count, String prefix, i64 id);
 lbValue lb_gen_map_header(lbProcedure *p, lbValue map_val_ptr, Type *map_type);
 lbValue lb_gen_map_key(lbProcedure *p, lbValue key, Type *key_type);
-lbValue lb_insert_dynamic_map_key_and_value(lbProcedure *p, lbAddr addr, Type *map_type, lbValue map_key, lbValue map_value);
+void    lb_insert_dynamic_map_key_and_value(lbProcedure *p, lbAddr addr, Type *map_type, lbValue map_key, lbValue map_value);
 
 
 #define LB_STARTUP_RUNTIME_PROC_NAME "__$startup_runtime"