@@ -80,29 +80,17 @@ class NQP::World is HLL::World {
80
80
81
81
82
82
# Emit fixup or loading code.
83
- my $ set_outer := QAST ::VM. new (
84
- : parrot(QAST ::Op. new (
85
- : op(' callmethod' ), : name(' set_outer_ctx' ),
86
- QAST ::BVal. new ( : value($ * UNIT ) ),
87
- QAST ::Op. new (
88
- : op(' callmethod' ), : name(' load_setting' ),
89
- QAST ::Op. new (
90
- : op(' getcurhllsym' ),
91
- QAST ::SVal. new ( : value(' ModuleLoader' ) )
92
- ),
93
- QAST ::SVal. new ( : value($ setting_name ) )
94
- ))),
95
- : jvm(QAST ::Op. new (
96
- : op(' forceouterctx' ),
97
- QAST ::BVal. new ( : value($ * UNIT ) ),
83
+ my $ set_outer := QAST ::Op. new (
84
+ : op(' forceouterctx' ),
85
+ QAST ::BVal. new ( : value($ * UNIT ) ),
86
+ QAST ::Op. new (
87
+ : op(' callmethod' ), : name(' load_setting' ),
98
88
QAST ::Op. new (
99
- : op(' callmethod' ), : name(' load_setting' ),
100
- QAST ::Op. new (
101
- : op(' getcurhllsym' ),
102
- QAST ::SVal. new ( : value(' ModuleLoader' ) )
103
- ),
104
- QAST ::SVal. new ( : value($ setting_name ) )
105
- ))));
89
+ : op(' getcurhllsym' ),
90
+ QAST ::SVal. new ( : value(' ModuleLoader' ) )
91
+ ),
92
+ QAST ::SVal. new ( : value($ setting_name ) )
93
+ ));
106
94
if self . is_precompilation_mode() {
107
95
self . add_load_dependency_task(: deserialize_past(QAST ::Stmts. new (
108
96
QAST ::Op. new (
@@ -240,7 +228,7 @@ class NQP::World is HLL::World {
240
228
my $ c := nqp :: elems (@ allcodes );
241
229
my $ i := 0 ;
242
230
while $ i < $ c {
243
- my $ subid := @ allcodes [$ i ]. get_subid( );
231
+ my $ subid := nqp ::getcodecuid( @ allcodes [$ i ]);
244
232
if nqp ::existskey(% ! code_objects_to_fix_up , $ subid ) {
245
233
# First, go over the code objects. Update the $!do, and the
246
234
# entry in the SC. Make sure the newly compiled code is marked
0 commit comments