Fix symbol table handling in functions.

tests_lit/reader_tests/insertextract.ll

Index: tests_lit/reader_tests/insertextract.ll
diff --git a/tests_lit/reader_tests/insertextract.ll b/tests_lit/reader_tests/insertextract.ll
index 51f54b90b70170e5aa632633e034ac0ead3db4b8..c77acf23d08082e7a62ef0c954485e0874e7ccba 100644
--- a/tests_lit/reader_tests/insertextract.ll
+++ b/tests_lit/reader_tests/insertextract.ll
@@ -1,174 +1,189 @@
 ; Tests insertelement and extractelement vector 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
 
 ; TODO(kschimpf): Change index arguments to valid constant indices once
 ; we can handle constants.
 
 define void @ExtractV4xi1(<4 x i1> %v, i32 %i) {
+entry:
   %e = extractelement <4 x i1> %v, i32 %i
   ret void
 }
 
-; CHECK:      define void @ExtractV4xi1(<4 x i1> %__0, i32 %__1) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__2 = extractelement <4 x i1> %__0, i32 %__1
+; CHECK:      define void @ExtractV4xi1(<4 x i1> %v, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = extractelement <4 x i1> %v, i32 %i
 ; CHECK-NEXT:   ret void
 ; CHECK-NEXT: }
 
 define void @ExtractV8xi1(<8 x i1> %v, i32 %i) {
+entry:
   %e = extractelement <8 x i1> %v, i32 %i
   ret void
 }
 
-; CHECK-NEXT: define void @ExtractV8xi1(<8 x i1> %__0, i32 %__1) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__2 = extractelement <8 x i1> %__0, i32 %__1
+; CHECK-NEXT: define void @ExtractV8xi1(<8 x i1> %v, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = extractelement <8 x i1> %v, i32 %i
 ; CHECK-NEXT:   ret void
 ; CHECK-NEXT: }
 
 define void @ExtractV16xi1(<16 x i1> %v, i32 %i) {
+entry:
   %e = extractelement <16 x i1> %v, i32 %i
   ret void
 }
 
-; CHECK-NEXT: define void @ExtractV16xi1(<16 x i1> %__0, i32 %__1) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__2 = extractelement <16 x i1> %__0, i32 %__1
+; CHECK-NEXT: define void @ExtractV16xi1(<16 x i1> %v, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = extractelement <16 x i1> %v, i32 %i
 ; CHECK-NEXT:   ret void
 ; CHECK-NEXT: }
 
 define void @ExtractV16xi8(<16 x i8> %v, i32 %i) {
+entry:
   %e = extractelement <16 x i8> %v, i32 %i
   ret void
 }
 
-; CHECK-NEXT: define void @ExtractV16xi8(<16 x i8> %__0, i32 %__1) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__2 = extractelement <16 x i8> %__0, i32 %__1
+; CHECK-NEXT: define void @ExtractV16xi8(<16 x i8> %v, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = extractelement <16 x i8> %v, i32 %i
 ; CHECK-NEXT:   ret void
 ; CHECK-NEXT: }
 
 define void @ExtractV8xi16(<8 x i16> %v, i32 %i) {
+entry:
   %e = extractelement <8 x i16> %v, i32 %i
   ret void
 }
 
-; CHECK-NEXT: define void @ExtractV8xi16(<8 x i16> %__0, i32 %__1) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__2 = extractelement <8 x i16> %__0, i32 %__1
+; CHECK-NEXT: define void @ExtractV8xi16(<8 x i16> %v, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = extractelement <8 x i16> %v, i32 %i
 ; CHECK-NEXT:   ret void
 ; CHECK-NEXT: }
 
 define i32 @ExtractV4xi32(<4 x i32> %v, i32 %i) {
+entry:
   %e = extractelement <4 x i32> %v, i32 %i
   ret i32 %e
 }
 
-; CHECK-NEXT: define i32 @ExtractV4xi32(<4 x i32> %__0, i32 %__1) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__2 = extractelement <4 x i32> %__0, i32 %__1
-; CHECK-NEXT:   ret i32 %__2
+; CHECK-NEXT: define i32 @ExtractV4xi32(<4 x i32> %v, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = extractelement <4 x i32> %v, i32 %i
+; CHECK-NEXT:   ret i32 %e
 ; CHECK-NEXT: }
 
 define float @ExtractV4xfloat(<4 x float> %v, i32 %i) {
+entry:
   %e = extractelement <4 x float> %v, i32 %i
   ret float %e
 }
 
-; CHECK-NEXT: define float @ExtractV4xfloat(<4 x float> %__0, i32 %__1) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__2 = extractelement <4 x float> %__0, i32 %__1
-; CHECK-NEXT:   ret float %__2
+; CHECK-NEXT: define float @ExtractV4xfloat(<4 x float> %v, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = extractelement <4 x float> %v, i32 %i
+; CHECK-NEXT:   ret float %e
 ; CHECK-NEXT: }
 
 define <4 x i1> @InsertV4xi1(<4 x i1> %v, i32 %pe, i32 %i) {
+entry:
   %e = trunc i32 %pe to i1
   %r = insertelement <4 x i1> %v, i1 %e, i32 %i
   ret <4 x i1> %r
 }
 
-; CHECK-NEXT: define <4 x i1> @InsertV4xi1(<4 x i1> %__0, i32 %__1, i32 %__2) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__3 = trunc i32 %__1 to i1
-; CHECK-NEXT:   %__4 = insertelement <4 x i1> %__0, i1 %__3, i32 %__2
-; CHECK-NEXT:   ret i1 %__4
+; CHECK-NEXT: define <4 x i1> @InsertV4xi1(<4 x i1> %v, i32 %pe, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = trunc i32 %pe to i1
+; CHECK-NEXT:   %r = insertelement <4 x i1> %v, i1 %e, i32 %i
+; CHECK-NEXT:   ret i1 %r
 ; CHECK-NEXT: }
 
 define <8 x i1> @InsertV8xi1(<8 x i1> %v, i32 %pe, i32 %i) {
+entry:
   %e = trunc i32 %pe to i1
   %r = insertelement <8 x i1> %v, i1 %e, i32 %i
   ret <8 x i1> %r
 }
 
-; CHECK-NEXT: define <8 x i1> @InsertV8xi1(<8 x i1> %__0, i32 %__1, i32 %__2) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__3 = trunc i32 %__1 to i1
-; CHECK-NEXT:   %__4 = insertelement <8 x i1> %__0, i1 %__3, i32 %__2
-; CHECK-NEXT:   ret i1 %__4
+; CHECK-NEXT: define <8 x i1> @InsertV8xi1(<8 x i1> %v, i32 %pe, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = trunc i32 %pe to i1
+; CHECK-NEXT:   %r = insertelement <8 x i1> %v, i1 %e, i32 %i
+; CHECK-NEXT:   ret i1 %r
 ; CHECK-NEXT: }
 
 define <16 x i1> @InsertV16xi1(<16 x i1> %v, i32 %pe, i32 %i) {
+entry:
   %e = trunc i32 %pe to i1
   %r = insertelement <16 x i1> %v, i1 %e, i32 %i
   ret <16 x i1> %r
 }
 
-; CHECK-NEXT: define <16 x i1> @InsertV16xi1(<16 x i1> %__0, i32 %__1, i32 %__2) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__3 = trunc i32 %__1 to i1
-; CHECK-NEXT:   %__4 = insertelement <16 x i1> %__0, i1 %__3, i32 %__2
-; CHECK-NEXT:   ret i1 %__4
+; CHECK-NEXT: define <16 x i1> @InsertV16xi1(<16 x i1> %v, i32 %pe, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = trunc i32 %pe to i1
+; CHECK-NEXT:   %r = insertelement <16 x i1> %v, i1 %e, i32 %i
+; CHECK-NEXT:   ret i1 %r
 ; CHECK-NEXT: }
 
 define <16 x i8> @InsertV16xi8(<16 x i8> %v, i32 %pe, i32 %i) {
+entry:
   %e = trunc i32 %pe to i8
   %r = insertelement <16 x i8> %v, i8 %e, i32 %i
   ret <16 x i8> %r
 }
 
-; CHECK-NEXT: define <16 x i8> @InsertV16xi8(<16 x i8> %__0, i32 %__1, i32 %__2) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__3 = trunc i32 %__1 to i8
-; CHECK-NEXT:   %__4 = insertelement <16 x i8> %__0, i8 %__3, i32 %__2
-; CHECK-NEXT:   ret i8 %__4
+; CHECK-NEXT: define <16 x i8> @InsertV16xi8(<16 x i8> %v, i32 %pe, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = trunc i32 %pe to i8
+; CHECK-NEXT:   %r = insertelement <16 x i8> %v, i8 %e, i32 %i
+; CHECK-NEXT:   ret i8 %r
 ; CHECK-NEXT: }
 
 define <8 x i16> @InsertV8xi16(<8 x i16> %v, i32 %pe, i32 %i) {
+entry:
   %e = trunc i32 %pe to i16
   %r = insertelement <8 x i16> %v, i16 %e, i32 %i
   ret <8 x i16> %r
 }
 
-; CHECK-NEXT: define <8 x i16> @InsertV8xi16(<8 x i16> %__0, i32 %__1, i32 %__2) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__3 = trunc i32 %__1 to i16
-; CHECK-NEXT:   %__4 = insertelement <8 x i16> %__0, i16 %__3, i32 %__2
-; CHECK-NEXT:   ret i16 %__4
+; CHECK-NEXT: define <8 x i16> @InsertV8xi16(<8 x i16> %v, i32 %pe, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %e = trunc i32 %pe to i16
+; CHECK-NEXT:   %r = insertelement <8 x i16> %v, i16 %e, i32 %i
+; CHECK-NEXT:   ret i16 %r
 ; CHECK-NEXT: }
 
-define <4 x i32> @InsertV16xi32(<4 x i32> %v, i32 %e, i32 %i) {
+define <4 x i32> @InsertV4xi32(<4 x i32> %v, i32 %e, i32 %i) {
+entry:
   %r = insertelement <4 x i32> %v, i32 %e, i32 %i
   ret <4 x i32> %r
 }
 
-; CHECK-NEXT: define <4 x i32> @InsertV16xi32(<4 x i32> %__0, i32 %__1, i32 %__2) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__3 = insertelement <4 x i32> %__0, i32 %__1, i32 %__2
-; CHECK-NEXT:   ret i32 %__3
+; CHECK-NEXT: define <4 x i32> @InsertV4xi32(<4 x i32> %v, i32 %e, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %r = insertelement <4 x i32> %v, i32 %e, i32 %i
+; CHECK-NEXT:   ret i32 %r
 ; CHECK-NEXT: }
 
-define <4 x float> @InsertV16xfloat(<4 x float> %v, float %e, i32 %i) {
+define <4 x float> @InsertV4xfloat(<4 x float> %v, float %e, i32 %i) {
+entry:
   %r = insertelement <4 x float> %v, float %e, i32 %i
   ret <4 x float> %r
 }
 
-; CHECK-NEXT: define <4 x float> @InsertV16xfloat(<4 x float> %__0, float %__1, i32 %__2) {
-; CHECK-NEXT: __0:
-; CHECK-NEXT:   %__3 = insertelement <4 x float> %__0, float %__1, i32 %__2
-; CHECK-NEXT:   ret float %__3
+; CHECK-NEXT: define <4 x float> @InsertV4xfloat(<4 x float> %v, float %e, i32 %i) {
+; CHECK-NEXT: entry:
+; CHECK-NEXT:   %r = insertelement <4 x float> %v, float %e, i32 %i
+; CHECK-NEXT:   ret float %r
 ; CHECK-NEXT: }