Ticket #281: tt281-debuginfo-fastcore.patch
| File tt281-debuginfo-fastcore.patch, 2.7 KB (added by rurban, 13 years ago) |
|---|
-
src/runops_cores.c
old new 279 279 runops_fast_core(PARROT_INTERP, ARGIN(opcode_t *pc)) 280 280 { 281 281 ASSERT_ARGS(runops_fast_core) 282 283 /* disable pc */ 284 CONTEXT(interp)->current_pc = NULL; 285 282 286 while (pc) { 283 287 DO_OP(pc, interp); 284 288 } … … 307 311 runops_cgoto_core(PARROT_INTERP, ARGIN(opcode_t *pc)) 308 312 { 309 313 ASSERT_ARGS(runops_cgoto_core) 314 315 /* disable pc */ 316 CONTEXT(interp)->current_pc = NULL; 317 310 318 #ifdef HAVE_COMPUTED_GOTO 311 319 pc = cg_core(pc, interp); 312 320 return pc; -
t/op/debuginfo.t
old new 23 23 24 24 =cut 25 25 26 pasm_output_like( <<'CODE', <<'OUTPUT', "getline, getfile" ); 26 $ENV{TEST_PROG_ARGS} ||= ''; 27 my $nolineno = $ENV{TEST_PROG_ARGS} =~ /-f|-g/ 28 ? "\\(unknown file\\)\n-1" : "debuginfo_\\d+\\.pasm\n\\d"; 29 30 SKIP: { 31 skip "disabled on fast-core",1 if $ENV{TEST_PROG_ARGS} =~ /-f/; 32 33 pasm_output_like( <<'CODE', <<"OUTPUT", "getline, getfile" ); 27 34 .pcc_sub main: 28 35 getfile S0 29 36 getline I0 30 print S0 31 print "\n" 32 print I0 33 print "\n" 37 say S0 38 say I0 34 39 end 35 40 CODE 36 /debuginfo_\d+\.pasm 37 \d/ 41 /$nolineno/ 38 42 OUTPUT 43 } 39 44 40 45 pir_error_output_like( <<'CODE', <<'OUTPUT', "debug backtrace - Null PMC access" ); 41 46 .sub main … … 159 164 called from Sub 'main' pc (\d+|-1) \(.*?:(\d+|-1)\)$/ 160 165 OUTPUT 161 166 167 $nolineno = $ENV{TEST_PROG_ARGS} =~ /-f|-g/ 168 ? '\(\(unknown file\):-1\)' : '\(xyz.pir:126\)'; 169 170 SKIP: { 171 skip "disabled on fast-core",2 if $ENV{TEST_PROG_ARGS} =~ /-f/; 172 162 173 # See "RT #43269 and .annotate 163 pir_error_output_like( <<'CODE', << 'OUTPUT', "setfile and setline" );174 pir_error_output_like( <<'CODE', <<"OUTPUT", "setfile and setline" ); 164 175 .sub main :main 165 176 setfile "xyz.pir" 166 177 setline 123 … … 169 180 'no_such_function'($S0, $I0) 170 181 .end 171 182 CODE 172 / \(xyz.pir:126\)/183 /$nolineno/ 173 184 OUTPUT 174 185 186 $nolineno = $ENV{TEST_PROG_ARGS} =~ /-f|-g/ 187 ? '\(\(unknown file\):-1\)' : '\(foo.p6:128\)'; 175 188 # See "RT #43269 and .annotate 176 pir_error_output_like( <<'CODE', << 'OUTPUT', "setfile and setline" );189 pir_error_output_like( <<'CODE', <<"OUTPUT", "setfile and setline" ); 177 190 .sub main :main 178 191 setfile "foo.p6" 179 192 setline 123 … … 188 201 'nsf'($P1) 189 202 .end 190 203 CODE 191 / \(foo.p6:128\)/204 /$nolineno/ 192 205 OUTPUT 193 206 207 } 208 194 209 # Local Variables: 195 210 # mode: cperl 196 211 # cperl-indent-level: 4
