Uninitialized variable warning fix + test update (#693)

Author: vdonaldson

flang/lib/Lower/Bridge.cpp

@@ -1267,12 +1267,14 @@ class FirConverter : public Fortran::lower::AbstractConverter {
         continue;
       }
       mlir::CmpIPredicate pred;
-      if (attr.isa<fir::PointIntervalAttr>())
+      if (attr.isa<fir::PointIntervalAttr>()) {
         pred = mlir::CmpIPredicate::eq;
-      else if (attr.isa<fir::LowerBoundAttr>())
+      } else if (attr.isa<fir::LowerBoundAttr>()) {
         pred = mlir::CmpIPredicate::sge;
-      else if (attr.isa<fir::UpperBoundAttr>())
+      } else {
+        assert(attr.isa<fir::UpperBoundAttr>() && "unexpected predicate");
         pred = mlir::CmpIPredicate::sle;
+      }
       auto cond = genCond(*caseValue++, pred);
       genFIRConditionalBranch(cond, *caseBlock++, newBlock);
       builder->setInsertionPointToEnd(newBlock);

flang/test/Lower/associate-construct.f90

@@ -1,24 +1,43 @@
-! RUN: bbc %s -o - | tco | llc --relocation-model=pic --filetype=obj -o %t.o
-! RUN: %CC %t.o -L%L -Wl,-rpath -Wl,%L -lFortran_main -lFortranRuntime -lFortranDecimal -lm -o %t.out
-! RUN: %t.out | FileCheck %s
+! RUN: bbc -emit-fir -o - %s | FileCheck %s
 
+! CHECK-LABEL: func @_QQmain
 program p
-  integer :: n, foo
-  n = 0
-  associate (i => n, j => n + 10, k => foo(20))
-!   CHECK: 0 0 10 20
-    print*, n, i, j, k
+  ! CHECK: [[N:%[0-9]+]] = fir.alloca i32 {name = "_QEn"}
+  ! CHECK: [[T:%[0-9]+]] = fir.address_of(@_QEt) : !fir.ref<!fir.array<3xi32>>
+  integer :: n, foo, t(3)
+  ! CHECK: [[N]]
+  ! CHECK-COUNT-3: fir.coordinate_of [[T]]
+  n = 100; t(1) = 111; t(2) = 222; t(3) = 333
+  ! CHECK: fir.load [[N]]
+  ! CHECK: addi {{.*}} %c5
+  ! CHECK: fir.store %{{[0-9]*}} to [[B:%[0-9]+]]
+  ! CHECK: [[C:%[0-9]+]] = fir.coordinate_of [[T]]
+  ! CHECK: fir.call @_QPfoo
+  ! CHECK: fir.store %{{[0-9]*}} to [[D:%[0-9]+]]
+  associate (a => n, b => n+5, c => t(2), d => foo(7))
+    ! CHECK: fir.load [[N]]
+    ! CHECK: addi %{{[0-9]*}}, %c1
+    ! CHECK: fir.store %{{[0-9]*}} to [[N]]
+    a = a + 1
+    ! CHECK: fir.load [[C]]
+    ! CHECK: addi %{{[0-9]*}}, %c1
+    ! CHECK: fir.store %{{[0-9]*}} to [[C]]
+    c = c + 1
+    ! CHECK: fir.load [[N]]
+    ! CHECK: addi %{{[0-9]*}}, %c1
+    ! CHECK: fir.store %{{[0-9]*}} to [[N]]
     n = n + 1
-!   CHECK: 1 1 10 20
-    print*, n, i, j, k
-    i = i + 1
-!   CHECK: 2 2 10 20
-    print*, n, i, j, k
+    ! CHECK: fir.load [[N]]
+    ! CHECK: fir.embox [[T]]
+    ! CHECK: fir.load [[N]]
+    ! CHECK: fir.load [[B]]
+    ! CHECK: fir.load [[C]]
+    ! CHECK: fir.load [[D]]
+    print*, n, t, a, b, c, d ! expected output: 102 111 223 333 102 105 223 7
   end associate
-! CHECK: 2
-  print*, n
 end
 
+! CHECK-LABEL: func @_QPfoo
 integer function foo(x)
   integer x
   integer, save :: i = 0