Skip to content

Commit

Permalink
removed nitvm engine from tests
Browse files Browse the repository at this point in the history
Signed-off-by: Louis-Vincent Boudreault <[email protected]>
  • Loading branch information
lvboudre committed Oct 10, 2019
1 parent 5e750ab commit 21a2325
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/compiler/abstract_compiler.nit
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ abstract class AbstractCompilerVisitor
fun native_array_set(native_array: RuntimeVariable, index: Int, value: RuntimeVariable) is abstract

# Instantiate a new routine pointer
fun routine_ref_instance(routine_mclass_type: MClassType, recv: RuntimeVariable, mmethoddef: MMethodDef): RuntimeVariable is abstract
fun routine_ref_instance(routine_mclass_type: MClassType, recv: RuntimeVariable, callsite: CallSite): RuntimeVariable is abstract

# Call the underlying referenced function
fun routine_ref_call(mmethoddef: MMethodDef, args: Array[RuntimeVariable]) is abstract
Expand Down Expand Up @@ -4406,7 +4406,7 @@ redef class ACallrefExpr
redef fun expr(v)
do
var recv = v.expr(self.n_expr, null)
var res = v.routine_ref_instance(mtype.as(MClassType), recv, callsite.as(not null).mpropdef)
var res = v.routine_ref_instance(mtype.as(MClassType), recv, callsite.as(not null))
return res
end
end
Expand Down
3 changes: 2 additions & 1 deletion src/compiler/global_compiler.nit
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,9 @@ class GlobalCompilerVisitor
self.add("{recv}[{i}]={val};")
end

redef fun routine_ref_instance(routine_mclass_type, recv, mmethoddef)
redef fun routine_ref_instance(routine_mclass_type, recv, callsite)
do
var mmethoddef = callsite.mpropdef
var method = new CustomizedRuntimeFunction(mmethoddef, recv.mcasttype.as(MClassType))
var my_recv = recv
if recv.mtype.is_c_primitive then
Expand Down
3 changes: 2 additions & 1 deletion src/compiler/separate_compiler.nit
Original file line number Diff line number Diff line change
Expand Up @@ -2188,9 +2188,10 @@ class SeparateCompilerVisitor
self.add("{recv}[{i}]={val};")
end

redef fun routine_ref_instance(routine_type, recv, mmethoddef)
redef fun routine_ref_instance(routine_type, recv, callsite)
do
#debug "ENTER ref_instance"
var mmethoddef = callsite.mpropdef
var mmethod = mmethoddef.mproperty
# routine_mclass is the specialized one, e.g: FunRef1, ProcRef2, etc..
var routine_mclass = routine_type.mclass
Expand Down
3 changes: 2 additions & 1 deletion src/compiler/separate_erasure_compiler.nit
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,9 @@ class SeparateErasureCompilerVisitor
return res
end

redef fun routine_ref_instance(routine_type, recv, mmethoddef)
redef fun routine_ref_instance(routine_type, recv, callsite)
do
var mmethoddef = callsite.mpropdef
#debug "ENTER ref_instance"
var mmethod = mmethoddef.mproperty
# routine_mclass is the specialized one, e.g: FunRef1, ProcRef2, etc..
Expand Down
2 changes: 1 addition & 1 deletion tests/testall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Run some tests on each engine

engine=(nitcg nitcg nitcs nitcsg nitce niti nitvm)
engine=(nitcg nitcg nitcs nitcsg nitce niti)
if uname | grep MINGW64 1>/dev/null 2>&1; then
engine=(nitcg nitcg nitcs nitcsg nitce)
fi
Expand Down

0 comments on commit 21a2325

Please sign in to comment.