Skip to content

Commit d348d72

Browse files
committed
Some more decont-ing.
1 parent d31030b commit d348d72

File tree

1 file changed

+8
-8
lines changed
  • src/vm/jvm/runtime/org/perl6/nqp/runtime

1 file changed

+8
-8
lines changed

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,10 +1526,10 @@ public static SixModelObject create(SixModelObject obj, ThreadContext tc) {
15261526
return res;
15271527
}
15281528
public static SixModelObject clone(SixModelObject obj, ThreadContext tc) {
1529-
return obj.clone(tc);
1529+
return decont(obj, tc).clone(tc);
15301530
}
15311531
public static long isconcrete(SixModelObject obj, ThreadContext tc) {
1532-
return obj == null || obj instanceof TypeObject ? 0 : 1;
1532+
return obj == null || decont(obj, tc) instanceof TypeObject ? 0 : 1;
15331533
}
15341534
public static SixModelObject knowhow(ThreadContext tc) {
15351535
return tc.gc.KnowHOW;
@@ -1733,24 +1733,24 @@ public static SixModelObject box_s(String value, SixModelObject type, ThreadCont
17331733
return res;
17341734
}
17351735
public static long unbox_i(SixModelObject obj, ThreadContext tc) {
1736-
return obj.get_int(tc);
1736+
return decont(obj, tc).get_int(tc);
17371737
}
17381738
public static double unbox_n(SixModelObject obj, ThreadContext tc) {
1739-
return obj.get_num(tc);
1739+
return decont(obj, tc).get_num(tc);
17401740
}
17411741
public static String unbox_s(SixModelObject obj, ThreadContext tc) {
1742-
return obj.get_str(tc);
1742+
return decont(obj, tc).get_str(tc);
17431743
}
17441744
public static long isint(SixModelObject obj, ThreadContext tc) {
1745-
StorageSpec ss = obj.st.REPR.get_storage_spec(tc, obj.st);
1745+
StorageSpec ss = decont(obj, tc).st.REPR.get_storage_spec(tc, obj.st);
17461746
return (ss.can_box & StorageSpec.CAN_BOX_INT) == 0 ? 0 : 1;
17471747
}
17481748
public static long isnum(SixModelObject obj, ThreadContext tc) {
1749-
StorageSpec ss = obj.st.REPR.get_storage_spec(tc, obj.st);
1749+
StorageSpec ss = decont(obj, tc).st.REPR.get_storage_spec(tc, obj.st);
17501750
return (ss.can_box & StorageSpec.CAN_BOX_NUM) == 0 ? 0 : 1;
17511751
}
17521752
public static long isstr(SixModelObject obj, ThreadContext tc) {
1753-
StorageSpec ss = obj.st.REPR.get_storage_spec(tc, obj.st);
1753+
StorageSpec ss = decont(obj, tc).st.REPR.get_storage_spec(tc, obj.st);
17541754
return (ss.can_box & StorageSpec.CAN_BOX_STR) == 0 ? 0 : 1;
17551755
}
17561756

0 commit comments

Comments
 (0)