@@ -1428,7 +1428,7 @@ public static SixModelObject getlex(String name, ThreadContext tc) {
1428
1428
return curFrame .oLex [found ];
1429
1429
curFrame = curFrame .outer ;
1430
1430
}
1431
- return null ;
1431
+ return createNull ( tc ) ;
1432
1432
}
1433
1433
public static long getlex_i (String name , ThreadContext tc ) {
1434
1434
CallFrame curFrame = tc .curFrame ;
@@ -1662,7 +1662,7 @@ public static SixModelObject getlexdyn(String name, ThreadContext tc) {
1662
1662
return curFrame .oLex [idx ];
1663
1663
curFrame = curFrame .caller ;
1664
1664
}
1665
- return null ;
1665
+ return createNull ( tc ) ;
1666
1666
}
1667
1667
public static SixModelObject getlexcaller (String name , ThreadContext tc ) {
1668
1668
CallFrame curCallerFrame = tc .curFrame .caller ;
@@ -1676,7 +1676,7 @@ public static SixModelObject getlexcaller(String name, ThreadContext tc) {
1676
1676
}
1677
1677
curCallerFrame = curCallerFrame .caller ;
1678
1678
}
1679
- return null ;
1679
+ return createNull ( tc ) ;
1680
1680
}
1681
1681
1682
1682
/* Relative lexical lookups. */
@@ -1689,7 +1689,7 @@ public static SixModelObject getlexrel(SixModelObject ctx, String name, ThreadCo
1689
1689
return curFrame .oLex [found ];
1690
1690
curFrame = curFrame .outer ;
1691
1691
}
1692
- return null ;
1692
+ return createNull ( tc ) ;
1693
1693
}
1694
1694
else {
1695
1695
throw ExceptionHandling .dieInternal (tc , "getlexrel requires an operand with REPR ContextRef" );
@@ -1704,7 +1704,7 @@ public static SixModelObject getlexreldyn(SixModelObject ctx, String name, Threa
1704
1704
return curFrame .oLex [idx ];
1705
1705
curFrame = curFrame .caller ;
1706
1706
}
1707
- return null ;
1707
+ return createNull ( tc ) ;
1708
1708
}
1709
1709
else {
1710
1710
throw ExceptionHandling .dieInternal (tc , "getlexreldyn requires an operand with REPR ContextRef" );
@@ -1723,7 +1723,7 @@ public static SixModelObject getlexrelcaller(SixModelObject ctx, String name, Th
1723
1723
}
1724
1724
curCallerFrame = curCallerFrame .caller ;
1725
1725
}
1726
- return null ;
1726
+ return createNull ( tc ) ;
1727
1727
}
1728
1728
else {
1729
1729
throw ExceptionHandling .dieInternal (tc , "getlexrelcaller requires an operand with REPR ContextRef" );
@@ -1741,7 +1741,7 @@ public static SixModelObject ctxouter(SixModelObject ctx, ThreadContext tc) {
1741
1741
if (ctx instanceof ContextRefInstance ) {
1742
1742
CallFrame outer = ((ContextRefInstance )ctx ).context .outer ;
1743
1743
if (outer == null )
1744
- return null ;
1744
+ return createNull ( tc ) ;
1745
1745
1746
1746
SixModelObject ContextRef = tc .gc .ContextRef ;
1747
1747
SixModelObject wrap = ContextRef .st .REPR .allocate (tc , ContextRef .st );
@@ -1756,7 +1756,7 @@ public static SixModelObject ctxcaller(SixModelObject ctx, ThreadContext tc) {
1756
1756
if (ctx instanceof ContextRefInstance ) {
1757
1757
CallFrame caller = ((ContextRefInstance )ctx ).context .caller ;
1758
1758
if (caller == null )
1759
- return null ;
1759
+ return createNull ( tc ) ;
1760
1760
1761
1761
SixModelObject ContextRef = tc .gc .ContextRef ;
1762
1762
SixModelObject wrap = ContextRef .st .REPR .allocate (tc , ContextRef .st );
@@ -1779,7 +1779,7 @@ public static SixModelObject ctxouterskipthunks(SixModelObject ctx, ThreadContex
1779
1779
while (outer != null && outer .codeRef .staticInfo .isThunk )
1780
1780
outer = outer .outer ;
1781
1781
if (outer == null )
1782
- return null ;
1782
+ return createNull ( tc ) ;
1783
1783
1784
1784
SixModelObject ContextRef = tc .gc .ContextRef ;
1785
1785
SixModelObject wrap = ContextRef .st .REPR .allocate (tc , ContextRef .st );
@@ -1796,7 +1796,7 @@ public static SixModelObject ctxcallerskipthunks(SixModelObject ctx, ThreadConte
1796
1796
while (caller != null && caller .codeRef .staticInfo .isThunk )
1797
1797
caller = caller .caller ;
1798
1798
if (caller == null )
1799
- return null ;
1799
+ return createNull ( tc ) ;
1800
1800
1801
1801
SixModelObject ContextRef = tc .gc .ContextRef ;
1802
1802
SixModelObject wrap = ContextRef .st .REPR .allocate (tc , ContextRef .st );
0 commit comments