Skip to content

Commit 21a2325

Browse files
committed
removed nitvm engine from tests
Signed-off-by: Louis-Vincent Boudreault <lv.boudreault95@gmail.com>
1 parent 5e750ab commit 21a2325

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

src/compiler/abstract_compiler.nit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ abstract class AbstractCompilerVisitor
13921392
fun native_array_set(native_array: RuntimeVariable, index: Int, value: RuntimeVariable) is abstract
13931393

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

13971397
# Call the underlying referenced function
13981398
fun routine_ref_call(mmethoddef: MMethodDef, args: Array[RuntimeVariable]) is abstract
@@ -4406,7 +4406,7 @@ redef class ACallrefExpr
44064406
redef fun expr(v)
44074407
do
44084408
var recv = v.expr(self.n_expr, null)
4409-
var res = v.routine_ref_instance(mtype.as(MClassType), recv, callsite.as(not null).mpropdef)
4409+
var res = v.routine_ref_instance(mtype.as(MClassType), recv, callsite.as(not null))
44104410
return res
44114411
end
44124412
end

src/compiler/global_compiler.nit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,9 @@ class GlobalCompilerVisitor
463463
self.add("{recv}[{i}]={val};")
464464
end
465465

466-
redef fun routine_ref_instance(routine_mclass_type, recv, mmethoddef)
466+
redef fun routine_ref_instance(routine_mclass_type, recv, callsite)
467467
do
468+
var mmethoddef = callsite.mpropdef
468469
var method = new CustomizedRuntimeFunction(mmethoddef, recv.mcasttype.as(MClassType))
469470
var my_recv = recv
470471
if recv.mtype.is_c_primitive then

src/compiler/separate_compiler.nit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2188,9 +2188,10 @@ class SeparateCompilerVisitor
21882188
self.add("{recv}[{i}]={val};")
21892189
end
21902190

2191-
redef fun routine_ref_instance(routine_type, recv, mmethoddef)
2191+
redef fun routine_ref_instance(routine_type, recv, callsite)
21922192
do
21932193
#debug "ENTER ref_instance"
2194+
var mmethoddef = callsite.mpropdef
21942195
var mmethod = mmethoddef.mproperty
21952196
# routine_mclass is the specialized one, e.g: FunRef1, ProcRef2, etc..
21962197
var routine_mclass = routine_type.mclass

src/compiler/separate_erasure_compiler.nit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,9 @@ class SeparateErasureCompilerVisitor
679679
return res
680680
end
681681

682-
redef fun routine_ref_instance(routine_type, recv, mmethoddef)
682+
redef fun routine_ref_instance(routine_type, recv, callsite)
683683
do
684+
var mmethoddef = callsite.mpropdef
684685
#debug "ENTER ref_instance"
685686
var mmethod = mmethoddef.mproperty
686687
# routine_mclass is the specialized one, e.g: FunRef1, ProcRef2, etc..

tests/testall.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# Run some tests on each engine
1717

18-
engine=(nitcg nitcg nitcs nitcsg nitce niti nitvm)
18+
engine=(nitcg nitcg nitcs nitcsg nitce niti)
1919
if uname | grep MINGW64 1>/dev/null 2>&1; then
2020
engine=(nitcg nitcg nitcs nitcsg nitce)
2121
fi

0 commit comments

Comments
 (0)