PNaCl dynamic linking: Fix handling of local relocations with addends

test/Transforms/NaCl/flatten-globals.ll

 ; RUN: opt -flatten-globals %s -S | FileCheck %s
 ; RUN: opt -flatten-globals %s -S | FileCheck %s -check-prefix=CLEANED
 
+; Check that the pass can handle its own output (idempotence).
+; RUN: opt -flatten-globals -flatten-globals %s -S
+
 target datalayout = "p:32:32:32"
 
 
 ; Check simple cases
 
 @var_i32 = global i32 258
 ; CHECK: @var_i32 = global [4 x i8] c"\02\01\00\00"
 ; CLEANED-NOT: global i32 258
 
 @external_var = external global i32
@@ skipping 166 matching lines @@
     i8* bitcast (void ()* @func_with_block to i8*), i32 123)
 ; CHECK: @func_addend = global i32 add (i32 ptrtoint (void ()* @func_with_block to i32), i32 123)
 
 ; Similarly, adding an offset to a label address isn't useful, but
 ; check it anyway.
 @block_addend = global i8* getelementptr (
     i8, 
     i8* blockaddress(@func_with_block, %label), i32 100)
 ; CHECK: @block_addend = global i32 add (i32 ptrtoint (i8* blockaddress(@func_with_block, %label) to i32), i32 100)
 
+@add_expr = global i32 add (i32 ptrtoint (%ptrs1* @ptrs1 to i32), i32 8)
+; CHECK: @add_expr = global i32 add (i32 ptrtoint (<{ i32, [8 x i8] }>* @ptrs1 to i32), i32 8)
+
 
 ; Special cases
 
 ; Leave vars with "appending" linkage alone.
 @appending = appending global [1 x i32*] [i32* @var1]
 ; CHECK: @appending = appending global [1 x i32*] [i32* bitcast ([4 x i8]* @var1 to i32*)]
 
 
 define i32* @get_address() {
   ret i32* @var_i32
 }
 ; CHECK: define i32* @get_address() {
 ; CHECK-NEXT: ret i32* bitcast ([4 x i8]* @var_i32 to i32*)
 
 
 define void @func_with_block() {
   br label %label
 label:
   ret void
 }