[PATCH] D131863: [CodeGen] Fix restore blocks' BasicBlock information in branch relaxation

[Mitch Phillips via Phabricator via llvm-commits]

hctim added a comment.

Looks like this patch might've caused a breakage for check-llvm, although I've done no work to actually validate this (just check-llvm from about 10-behind-head (i.e. without this patch) was okay, and at head right now is broken).

  /usr/local/google/home/mitchp/llvm/llvm/test/CodeGen/RISCV/branch-relaxation.ll:2944:20: error: CHECK-RV64-NEXT:
   expected string not found in input                                                                             
  ; CHECK-RV64-NEXT: sd ra, 16(sp) # 8-byte Folded Spill                                                          
                     ^                                                                                            
  <stdin>:1055:9: note: scanning from here                                                                        
   #NO_APP                                                                                                        
          ^                                                                                                       
  <stdin>:1139:2: note: possible intended match here                                                              
   sd t5, 16(sp) # 8-byte Folded Spill                                                                            
   ^                                                                                                              
  
  Input file: <stdin>
  Check file: /usr/local/google/home/mitchp/llvm/llvm/test/CodeGen/RISCV/branch-relaxation.ll
  
  -dump-input=help explains the following input dump.
  
  Input was:
  <<<<<<
               .
               .
               .
            1050:  .cfi_offset s9, -88 
            1051:  .cfi_offset s10, -96 
            1052:  .cfi_offset s11, -104 
            1053:  #APP 
            1054:  li ra, 1 
            1055:  #NO_APP 
  next:2944'0             X error: no match found
            1056:  #APP 
  next:2944'0     ~~~~~~
            1060:  li t1, 6                                                                                       
  next:2944'0     ~~~~~~~~~~                                                                                      
               .                                                                                                  
               .                                                                                                  
               .
            1134:  #APP 
  next:2944'0     ~~~~~~
            1135:  li t6, 31 
  next:2944'0     ~~~~~~~~~~~
            1136:  #NO_APP 
  next:2944'0     ~~~~~~~~~
            1137:  sd t6, 8(sp) # 8-byte Folded Spill 
  next:2944'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            1138:  sext.w t6, t6 
  next:2944'0     ~~~~~~~~~~~~~~~
            1139:  sd t5, 16(sp) # 8-byte Folded Spill 
  next:2944'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  next:2944'1      ?                                    possible intended match
            1140:  sext.w t5, t5 
  next:2944'0     ~~~~~~~~~~~~~~~
            1141:  bne t5, t6, .LBB6_1 
  next:2944'0     ~~~~~~~~~~~~~~~~~~~~~
            1142: # %bb.7: # %entry 
  next:2944'0     ~~~~~~~~~~~~~~~~~~
            1143:  jump .LBB6_4, t5 
  next:2944'0     ~~~~~~~~~~~~~~~~~~
            1144: .LBB6_1: # %cond_2 
  next:2944'0     ~~~~~~~~~~~~~~~~~~~
               .
               .
               .
  >>>>>>


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D131863/new/

https://reviews.llvm.org/D131863