Fix symbol table handling in functions.

tests_lit/reader_tests/branch.ll

Index: tests_lit/reader_tests/branch.ll
diff --git a/tests_lit/reader_tests/branch.ll b/tests_lit/reader_tests/branch.ll
index f57be6d68c3d6a44ffaf79e0060ae67113cbdfb5..66e9d5ec88c9d8abcd669d09ddc68829223771a6 100644
--- a/tests_lit/reader_tests/branch.ll
+++ b/tests_lit/reader_tests/branch.ll
@@ -1,11 +1,13 @@
 ; Tests if we handle a branch instructions.
 
-; RUN: llvm-as < %s | pnacl-freeze \
+; RUN: llvm-as < %s | pnacl-freeze -allow-local-symbol-tables \
 ; RUN:              | %llvm2ice -notranslate -verbose=inst -build-on-read \
 ; RUN:                -allow-pnacl-reader-error-recovery \
+; RUN:                -allow-local-symbol-tables \
 ; RUN:              | FileCheck %s
 
 define void @SimpleBranch() {
+entry:
   br label %b3
 b1:
   br label %b2
@@ -16,17 +18,18 @@ b3:
 }
 
 ; CHECK:      define void @SimpleBranch() {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   br label %__3
-; CHECK-NEXT: __1:
-; CHECK-NEXT:   br label %__2
-; CHECK-NEXT: __2:
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   br label %b3
+; CHECK-NEXT: b1:
+; CHECK-NEXT:   br label %b2
+; CHECK-NEXT: b2:
 ; CHECK-NEXT:   ret void
-; CHECK-NEXT: __3:
-; CHECK-NEXT:   br label %__1
+; CHECK-NEXT: b3:
+; CHECK-NEXT:   br label %b1
 ; CHECK-NEXT: }
 
 define void @CondBranch(i32 %p) {
+entry:
   %test = trunc i32 %p to i1
   br i1 %test, label %b1, label %b2
 b1:
@@ -35,12 +38,12 @@ b2:
   br i1 %test, label %b2, label %b1
 }
 
-; CHECK-NEXT: define void @CondBranch(i32 %__0) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__1 = trunc i32 %__0 to i1
-; CHECK-NEXT:   br i1 %__1, label %__1, label %__2
-; CHECK-NEXT: __1:
+; CHECK-NEXT: define void @CondBranch(i32 %p) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %test = trunc i32 %p to i1
+; CHECK-NEXT:   br i1 %test, label %b1, label %b2
+; CHECK-NEXT: b1:
 ; CHECK-NEXT:   ret void
-; CHECK-NEXT: __2:
-; CHECK-NEXT:   br i1 %__1, label %__2, label %__1
+; CHECK-NEXT: b2:
+; CHECK-NEXT:   br i1 %test, label %b2, label %b1
 ; CHECK-NEXT: }