From f34b5fb195c1019e915be41f2ae78e27f6e3395c Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Thu, 23 Jun 2016 22:08:36 -0400
Subject: [PATCH] compiler: do not call C `nit_alloc` directly but a Nit
 method.

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/compiler/abstract_compiler.nit |   13 ++++++++++++-
 src/compiler/separate_compiler.nit |   18 ++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit
index 1385694..e9eacef 100644
--- a/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@ -1218,6 +1218,16 @@ abstract class AbstractCompilerVisitor
 	# The method is unsafe and is just a direct wrapper for the specific implementation of native arrays
 	fun native_array_set(native_array: RuntimeVariable, index: Int, value: RuntimeVariable) is abstract
 
+	# Allocate `size` bytes with the low_level `nit_alloc` C function
+	#
+	# This method can be redefined to inject statistic or tracing code.
+	#
+	# `tag` if any, is used to mark the class of the allocated object.
+	fun nit_alloc(size: String, tag: nullable String): String
+	do
+		return "nit_alloc({size})"
+	end
+
 	# Evaluate `args` as expressions in the call of `mpropdef` on `recv`.
 	# This method is used to manage varargs in signatures and returns the real array
 	# of runtime variables to use in the call.
@@ -2549,7 +2559,8 @@ redef class AMethPropdef
 				v.ret(v.new_expr("!{res}", ret.as(not null)))
 				return true
 			else if pname == "new" then
-				v.ret(v.new_expr("(char*)nit_alloc({arguments[1]})", ret.as(not null)))
+				var alloc = v.nit_alloc(arguments[1].to_s, "NativeString")
+				v.ret(v.new_expr("(char*){alloc}", ret.as(not null)))
 				return true
 			else if pname == "fetch_4_chars" then
 				v.ret(v.new_expr("(long)*((uint32_t*)({arguments[0]} + {arguments[1]}))", ret.as(not null)))
diff --git a/src/compiler/separate_compiler.nit b/src/compiler/separate_compiler.nit
index 362bb52..63f5517 100644
--- a/src/compiler/separate_compiler.nit
+++ b/src/compiler/separate_compiler.nit
@@ -877,7 +877,8 @@ class SeparateCompiler
 			self.provide_declaration("BOX_{c_name}", "val* BOX_{c_name}({mtype.ctype_extern});")
 			v.add_decl("/* allocate {mtype} */")
 			v.add_decl("val* BOX_{mtype.c_name}({mtype.ctype_extern} value) \{")
-			v.add("struct instance_{c_name}*res = nit_alloc(sizeof(struct instance_{c_name}));")
+			var alloc = v.nit_alloc("sizeof(struct instance_{c_name})", mclass.full_name)
+			v.add("struct instance_{c_name}*res = {alloc};")
 			v.compiler.undead_types.add(mtype)
 			v.require_declaration("type_{c_name}")
 			v.add("res->type = &type_{c_name};")
@@ -899,7 +900,8 @@ class SeparateCompiler
 			else
 				var res = v.new_named_var(mtype, "self")
 				res.is_exact = true
-				v.add("{res} = nit_alloc(sizeof(struct instance_{mtype.c_name}));")
+				alloc = v.nit_alloc("sizeof(struct instance_{mtype.c_name})", mclass.full_name)
+				v.add("{res} = {alloc};")
 				v.add("{res}->type = type;")
 				hardening_live_type(v, "type")
 				v.require_declaration("class_{c_name}")
@@ -926,7 +928,8 @@ class SeparateCompiler
 			var res = v.get_name("self")
 			v.add_decl("struct instance_{c_name} *{res};")
 			var mtype_elt = mtype.arguments.first
-			v.add("{res} = nit_alloc(sizeof(struct instance_{c_name}) + length*sizeof({mtype_elt.ctype}));")
+			var alloc = v.nit_alloc("sizeof(struct instance_{c_name}) + length*sizeof({mtype_elt.ctype})", mclass.full_name)
+			v.add("{res} = {alloc};")
 			v.add("{res}->type = type;")
 			hardening_live_type(v, "type")
 			v.require_declaration("class_{c_name}")
@@ -949,7 +952,8 @@ class SeparateCompiler
 			else
 				var res = v.new_named_var(mtype, "self")
 				res.is_exact = true
-				v.add("{res} = nit_alloc(sizeof(struct instance_{pointer_type.c_name}));")
+				var alloc = v.nit_alloc("sizeof(struct instance_{pointer_type.c_name})", mclass.full_name)
+				v.add("{res} = {alloc};")
 				v.add("{res}->type = type;")
 				hardening_live_type(v, "type")
 				v.require_declaration("class_{c_name}")
@@ -972,9 +976,11 @@ class SeparateCompiler
 			res.is_exact = true
 			var attrs = self.attr_tables.get_or_null(mclass)
 			if attrs == null then
-				v.add("{res} = nit_alloc(sizeof(struct instance));")
+				var alloc = v.nit_alloc("sizeof(struct instance)", mclass.full_name)
+				v.add("{res} = {alloc};")
 			else
-				v.add("{res} = nit_alloc(sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t));")
+				var alloc = v.nit_alloc("sizeof(struct instance) + {attrs.length}*sizeof(nitattribute_t)", mclass.full_name)
+				v.add("{res} = {alloc};")
 			end
 			v.add("{res}->type = type;")
 			hardening_live_type(v, "type")
-- 
1.7.9.5