module vm
import interpreter::naive_interpreter
-import model_utils
import perfect_hashing
redef class ModelBuilder
- redef fun run_naive_interpreter(mainmodule: MModule, arguments: Array[String])
+ fun run_virtual_machine(mainmodule: MModule, arguments: Array[String])
do
var time0 = get_time
self.toolcontext.info("*** NITVM STARTING ***", 1)
super
end
- # Subtyping test for the virtual machine
+ # Runtime subtyping test
redef fun is_subtype(sub, sup: MType): Bool
do
+ if sub == sup then return true
+
var anchor = self.frame.arguments.first.mtype.as(MClassType)
+
+ # `sub` or `sup` are formal or virtual types, resolve them to concrete types
+ if sub isa MParameterType or sub isa MVirtualType then
+ sub = sub.resolve_for(anchor.mclass.mclass_type, anchor, mainmodule, false)
+ end
+ if sup isa MParameterType or sup isa MVirtualType then
+ sup = sup.resolve_for(anchor.mclass.mclass_type, anchor, mainmodule, false)
+ end
+
var sup_accept_null = false
if sup isa MNullableType then
sup_accept_null = true
end
# Now the case of direct null and nullable is over
- # An unfixed formal type can only accept itself
- if sup isa MParameterType or sup isa MVirtualType then
- return sub == sup
- end
-
if sub isa MParameterType or sub isa MVirtualType then
sub = sub.anchor_to(mainmodule, anchor)
# Manage the second layer of null/nullable
assert sup isa MClassType
- # Create the sup vtable if not create
+ # `sub` and `sup` can be discovered inside a Generic type during the subtyping test
if not sup.mclass.loaded then create_class(sup.mclass)
-
- # Sub can be discovered inside a Generic type during the subtyping test
if not sub.mclass.loaded then create_class(sub.mclass)
- if sup isa MGenericType then
- var sub2 = sub.supertype_to(mainmodule, anchor, sup.mclass)
- assert sub2.mclass == sup.mclass
-
- for i in [0..sup.mclass.arity[ do
- var sub_arg = sub2.arguments[i]
- var sup_arg = sup.arguments[i]
- var res = is_subtype(sub_arg, sup_arg)
-
- if res == false then return false
- end
- return true
- end
-
+ # For now, always use perfect hashing for subtyping test
var super_id = sup.mclass.vtable.id
var mask = sub.mclass.vtable.mask
- # For now, we always use perfect hashing for subtyping test
- return inter_is_subtype_ph(super_id, mask, sub.mclass.vtable.internal_vtable)
+ var res = inter_is_subtype_ph(super_id, mask, sub.mclass.vtable.internal_vtable)
+ if res == false then return false
+ # sub and sup can be generic types, each argument of generics has to be tested
+
+ if not sup isa MGenericType then return true
+ var sub2 = sub.supertype_to(mainmodule, anchor, sup.mclass)
+
+ # Test each argument of a generic by recursive calls
+ for i in [0..sup.mclass.arity[ do
+ var sub_arg = sub2.arguments[i]
+ var sup_arg = sup.arguments[i]
+ var res2 = is_subtype(sub_arg, sup_arg)
+ if res2 == false then return false
+ end
+ return true
end
# Subtyping test with perfect hashing
assert recv isa MutableInstance
- recv.internal_attributes = init_internal_attributes(initialization_value, recv.mtype.as(MClassType).mclass.all_mattributes(mainmodule, none_visibility).length)
+ recv.internal_attributes = init_internal_attributes(initialization_value, recv.mtype.as(MClassType).mclass.mattributes.length)
super
end
# introduced by self class in the vtable
var positions_methods: HashMap[MClass, Int] = new HashMap[MClass, Int]
+ # The `MAttribute` this class introduced
+ var intro_mattributes = new Array[MAttribute]
+
+ # The `MMethod` this class introduced
+ var intro_mmethods = new Array[MMethod]
+
+ # All `MAttribute` this class contains
+ var mattributes = new Array[MAttribute]
+
+ # All `MMethod` this class contains
+ var mmethods = new Array[MMethod]
+
# Allocates a VTable for this class and gives it an id
private fun make_vt(v: VirtualMachine)
do
if not parent.loaded then parent.make_vt(v)
# Get the number of introduced methods and attributes for this class
- var methods = 0
- var attributes = 0
+ var methods = parent.intro_mmethods.length
+ var attributes = parent.intro_mattributes.length
- for p in parent.intro_mproperties(none_visibility) do
- if p isa MMethod then methods += 1
- if p isa MAttribute then attributes += 1
- end
+ # Updates `mmethods` and `mattributes`
+ mmethods.add_all(parent.intro_mmethods)
+ mattributes.add_all(parent.intro_mattributes)
ids.push(parent.vtable.id)
nb_methods.push(methods)
# Fixing offsets for self attributes and methods
var relative_offset_attr = 0
var relative_offset_meth = 0
- for p in intro_mproperties(none_visibility) do
- if p isa MMethod then
- self_methods += 1
- p.offset = relative_offset_meth
- p.absolute_offset = offset_methods + relative_offset_meth
- relative_offset_meth += 1
- end
- if p isa MAttribute then
- nb_introduced_attributes += 1
- p.offset = relative_offset_attr
- p.absolute_offset = offset_attributes + relative_offset_attr
- relative_offset_attr += 1
+
+ # Update `intro_mmethods` and `intro_mattributes`
+ # For each MClassdef this MClass has
+ for classdef in mclassdefs do
+ # For each property this MClassdef introduce
+ for p in classdef.intro_mproperties do
+ # Collect properties and fixing offsets
+ if p isa MMethod then
+ self_methods += 1
+ p.offset = relative_offset_meth
+ p.absolute_offset = offset_methods + relative_offset_meth
+ relative_offset_meth += 1
+
+ intro_mmethods.add(p)
+ end
+ if p isa MAttribute then
+ nb_introduced_attributes += 1
+ p.offset = relative_offset_attr
+ p.absolute_offset = offset_attributes + relative_offset_attr
+ relative_offset_attr += 1
+
+ intro_mattributes.add(p)
+ end
end
end
+ # Updates caches with introduced attributes of `self` class
+ mattributes.add_all(intro_mattributes)
+ mmethods.add_all(intro_mmethods)
+
nb_methods_total.add_all(nb_methods)
nb_methods_total.push(self_methods)
private fun fill_vtable(v:VirtualMachine, table: VTable, cl: MClass)
do
var methods = new Array[MMethodDef]
- for m in cl.intro_mproperties(none_visibility) do
- if m isa MMethod then
- # `propdef` is the most specific implementation for this MMethod
- var propdef = m.lookup_first_definition(v.mainmodule, self.intro.bound_mtype)
- methods.push(propdef)
- end
+ for m in cl.intro_mmethods do
+ # `propdef` is the most specific implementation for this MMethod
+ var propdef = m.lookup_first_definition(v.mainmodule, self.intro.bound_mtype)
+ methods.push(propdef)
end
# Call a method in C to put propdefs of self methods in the vtables
private fun superclasses_ordering(v: VirtualMachine): Array[MClass]
do
var superclasses = new Array[MClass]
- superclasses.add_all(ancestors)
+
+ # Add all superclasses of `self`
+ superclasses.add_all(self.in_hierarchy(v.mainmodule).greaters)
var res = new Array[MClass]
if superclasses.length > 1 then
for cl in direct_parents do
# If we never have visited this class
if not res.has(cl) then
- var properties_length = cl.all_mproperties(v.mainmodule, none_visibility).length
+ var properties_length = cl.mmethods.length + cl.mattributes.length
if properties_length > max then
max = properties_length
prefix = cl
nitlanguage / nit.git / blobdiff