rta: add live_callsites and live_callsites

[nit.git] / src / compiler_ffi.nit

diff --git a/src/compiler_ffi.nit b/src/compiler_ffi.nit
index 2d520ac..3d5fbb6 100644 (file)
--- a/src/compiler_ffi.nit
+++ b/src/compiler_ffi.nit
@@ -124,11 +124,6 @@ redef class AExternMethPropdef
                        return
                end
 
-               if not v.compiler.supports_ffi then
-                       super
-                       return
-               end
-
                amodule.mmodule.uses_ffi = true
 
                var mclass_type = mpropdef.mclassdef.bound_mtype
@@ -196,11 +191,6 @@ redef class AExternInitPropdef
                        return
                end
 
-               if not v.compiler.supports_ffi then
-                       super
-                       return
-               end
-
                amodule.mmodule.uses_ffi = true
 
                var mclass_type = mpropdef.mclassdef.bound_mtype
@@ -352,7 +342,7 @@ redef class MExplicitCall
                # Internally, implement internal function
                var nitni_visitor = v.compiler.new_visitor
                nitni_visitor.frame = v.frame
-               var msignature = mproperty.intro.msignature
+               var msignature = mproperty.lookup_first_definition(v.compiler.mainmodule, recv_mtype).msignature
                var csignature_blind = mproperty.build_csignature(recv_mtype, v.compiler.mainmodule, null, long_signature, internal_call_context)
 
                nitni_visitor.add_decl("/* nitni callback for {mproperty.full_name} */")
@@ -393,6 +383,7 @@ redef class MExplicitCall
                if return_mtype != null then
                        assert ret_var != null
                        return_mtype = return_mtype.anchor_to(v.compiler.mainmodule, recv_mtype)
+                       ret_var = nitni_visitor.autobox(ret_var, return_mtype)
                        nitni_visitor.ret_to_c(ret_var, return_mtype)
                end
                nitni_visitor.add("\}")
@@ -408,7 +399,7 @@ redef class MExplicitSuper
                var mmodule = from.mclassdef.mmodule
 
                # In nitni files, declare internal function as extern
-               var internal_csignature = mproperty.build_csignature(mclass_type, v.compiler.mainmodule, null, long_signature, from_c_call_context)
+               var internal_csignature = mproperty.build_csignature(mclass_type, v.compiler.mainmodule, "___super", long_signature, internal_call_context)
                ccu.header_decl.add("extern {internal_csignature};\n")
 
                # In nitni files, #define friendly as extern
@@ -419,7 +410,7 @@ redef class MExplicitSuper
                # Internally, implement internal function
                var nitni_visitor = v.compiler.new_visitor
                nitni_visitor.frame = v.frame
-               var msignature = mproperty.intro.msignature
+               var msignature = mproperty.lookup_first_definition(v.compiler.mainmodule, mclass_type).msignature
 
                var csignature_blind = mproperty.build_csignature(mclass_type, v.compiler.mainmodule, "___super", long_signature, internal_call_context)
 
@@ -491,7 +482,7 @@ redef class MExplicitCast
                #
 
                # In nitni files, declare internal function as extern
-               full_friendly_csignature = "{to.cname} {v.compiler.mainmodule.name }___{from.mangled_cname}_as_{to.mangled_cname}({from.cname_blind})"
+               full_friendly_csignature = "{to.cname_blind} {v.compiler.mainmodule.name }___{from.mangled_cname}_as_{to.mangled_cname}({from.cname_blind})"
                ccu.header_decl.add("extern {full_friendly_csignature};\n")
 
                # In nitni files, #define friendly as extern