For PR1258:

Revise numeric value references to accommodate collapsed type planes.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35170 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 27 insertions, 29 deletions

diff --git a/test/Integer/basictest_bt.ll b/test/Integer/basictest_bt.ll
index 38d9ac9816..e5771075b1 100644
--- a/test/Integer/basictest_bt.ll
+++ b/test/Integer/basictest_bt.ll
@@ -2,33 +2,31 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-implementation
+implementation   ; Functions:
 
 ; Test "stripped" format where nothing is symbolic... this is how the bytecode
 ; format looks anyways (except for negative vs positive offsets)...
 ;
-define void @"void"(i39, i39)   ; Def %0, %1
-begin
-	add i39 0, 0      ; Def 2
-	sub i39 0, 4      ; Def 3
-	br label %1
+define void @void(i39, i39) {
+	add i39 0, 0			; <i39>:3 [#uses=2]
+	sub i39 0, 4			; <i39>:4 [#uses=2]
+	br label %5
 
-; <label>:1		; preds = %1, %0
-	add i39 %0, %1    ; Def 4
-	sub i39 %4, %3    ; Def 5
-	icmp sle i39 %5, %2  ; Def 0 - i1 plane
-	br i1 %0, label %2, label %1
+; <label>:5				; preds = %5, %2
+	add i39 %0, %1			; <i39>:6 [#uses=2]
+	sub i39 %6, %4			; <i39>:7 [#uses=1]
+	icmp sle i39 %7, %3		; <i1>:8 [#uses=1]
+	br i1 %8, label %9, label %5
 
-; <label>:2		; preds = %1
-	add i39 %0, %1    ; Def 6
-	sub i39 %4, %3    ; Def 7
-	icmp sle i39 %7, %2  ; Def 1 - i1 plane
+; <label>:9				; preds = %5
+	add i39 %0, %1			; <i39>:10 [#uses=0]
+	sub i39 %6, %4			; <i39>:11 [#uses=1]
+	icmp sle i39 %11, %3		; <i1>:12 [#uses=0]
 	ret void
-end
+}
 
 ; This function always returns zero
-define i39 @"zarro"()
-begin
+define i39 @zarro() {
 Startup:
 	ret i39 0
-end
+}
diff --git a/test/Integer/constexpr_bt.ll b/test/Integer/constexpr_bt.ll
index 2a8391acf4..1faa287e52 100644
--- a/test/Integer/constexpr_bt.ll
+++ b/test/Integer/constexpr_bt.ll
@@ -24,8 +24,8 @@ global i63  s0x012312   ; hexadecimal signed integer constants
 @t9 = global i33 fptosi (float sitofp (i33 8 to float) to i33) ;; Nested cast expression
 
 
-global i32* bitcast (float* @0 to i32*)   ;; Forward numeric reference
-global float* @0                       ;; Duplicate forward numeric reference
+global i32* bitcast (float* @4 to i32*)   ;; Forward numeric reference
+global float* @4                       ;; Duplicate forward numeric reference
 global float 0.0
 
 
diff --git a/test/Integer/constpointer_bt.ll b/test/Integer/constpointer_bt.ll
index be8fdfdcc7..5d541571bb 100644
--- a/test/Integer/constpointer_bt.ll
+++ b/test/Integer/constpointer_bt.ll
@@ -16,10 +16,10 @@
 
 @t2 = global i40 * @t1
 
-global float * @0                ;; Forward numeric reference
-global float * @0                ;; Duplicate forward numeric reference
+global float * @2                ;; Forward numeric reference
+global float * @2                ;; Duplicate forward numeric reference
 global float 0.0
-global float * @0                ;; Numeric reference
+global float * @2                ;; Numeric reference
 
 
 @fptr = global void() * @f       ;; Forward ref method defn
diff --git a/test/Integer/indirectcall_bt.ll b/test/Integer/indirectcall_bt.ll
index 747b39d8d7..67cff4e754 100644
--- a/test/Integer/indirectcall_bt.ll
+++ b/test/Integer/indirectcall_bt.ll
@@ -8,8 +8,8 @@ declare i32 @"atoi"(i8 *)
 
 define i63 @"fib"(i63 %n)
 begin
-  icmp ult i63 %n, 2       ; {i1}:0
-  br i1 %0, label %BaseCase, label %RecurseCase
+  icmp ult i63 %n, 2       ; {i1}:1
+  br i1 %1, label %BaseCase, label %RecurseCase
 
 BaseCase:
   ret i63 1
@@ -25,8 +25,8 @@ end
 
 define i63 @"realmain"(i32 %argc, i8 ** %argv)
 begin
-  icmp eq i32 %argc, 2      ; {i1}:0
-  br i1 %0, label %HasArg, label %Continue
+  icmp eq i32 %argc, 2      ; {i1}:1
+  br i1 %1, label %HasArg, label %Continue
 HasArg:
   ; %n1 = atoi(argv[1])
   %n1 = add i32 1, 1
diff --git a/test/Integer/testvarargs_bt.ll b/test/Integer/testvarargs_bt.ll
index d62e270dca..68cb36414c 100644
--- a/test/Integer/testvarargs_bt.ll
+++ b/test/Integer/testvarargs_bt.ll
@@ -9,7 +9,7 @@ declare i31 @"printf"(i8*, ...)   ;; Prototype for: i32 __builtin_printf(const c
 define i31 @"testvarar"()
 begin
 	call i31(i8*, ...) *@printf(i8 * null, i31 12, i8 42);
-	ret i31 %0
+	ret i31 %1
 end