Magnus pushed to branch wip/mangoiv/ghc-9.12-bp at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • rts/Interpreter.c
    ... ... @@ -468,7 +468,7 @@ slow_spw(void *Sp, StgStack *cur_stack, StgWord offset_words){
    468 468
         }
    
    469 469
         // 2b. Access the element if there is no underflow frame, it must be right
    
    470 470
         // at the top of the stack.
    
    471
    -    else if(Sp_plusW(offset_words) < (StgPtr)(cur_stack->stack + cur_stack->stack_size)) {
    
    471
    +    else if((StgPtr)Sp_plusW(offset_words) < (StgPtr)(cur_stack->stack + cur_stack->stack_size)) {
    
    472 472
             // Still inside the stack chunk
    
    473 473
             return Sp_plusW(offset_words);
    
    474 474
         } else {
    
    ... ... @@ -1832,7 +1832,7 @@ run_BCO:
    1832 1832
                         threadStackUnderflow(cap, cap->r.rCurrentTSO);
    
    1833 1833
                         LOAD_STACK_POINTERS;
    
    1834 1834
                         by -= sp_to_uf;
    
    1835
    -                } else if (Sp_plusW(by) < (StgPtr)(stk->stack + stk->stack_size)) {
    
    1835
    +                } else if ((StgPtr)Sp_plusW(by) < (StgPtr)(stk->stack + stk->stack_size)) {
    
    1836 1836
                         // we're within the first stack chunk, this chunk has
    
    1837 1837
                         // no underflow frame
    
    1838 1838
                         break;