stop using deprecated language/lib features in these testcases.

Author: lattner

Diff for: test/Prototypes/MutableIndexableDict.swift

@@ -120,7 +120,7 @@ struct FixedSizedRefArrayOfOptional<T>
   init(capacity: Int)
   {
     buffer = Storage.Buffer(Storage.self, capacity, capacity)
-    for var i = 0; i < capacity; ++i {
+    for i in 0 ..< capacity {
       (buffer.baseAddress + i).initialize(with: .none)
     }
 
@@ -182,7 +182,8 @@ struct DictionaryIndex<Element> : BidirectionalIndex {
 
   func predecessor() -> Index {
     var j = self.offset
-    while --j > 0 {
+    while j > 1 {
+      j -= 1
       if buffer[j] != nil {
         return Index(buffer: buffer, offset: j)
       }
@@ -275,7 +276,7 @@ struct Dictionary<Key: Hashable, Value> : Collection, Sequence {
       _buffer[i.offset] = Element(key: key, value: value)
 
       if !found {
-        ++_count
+        _count += 1
       }
     }
   }
@@ -360,7 +361,7 @@ struct Dictionary<Key: Hashable, Value> : Collection, Sequence {
 
     // remove the element
     _buffer[pos.offset] = .none
-    --_count
+    _count -= 1
 
     // If we've put a hole in a chain of contiguous elements, some
     // element after the hole may belong where the new hole is.

Diff for: test/SILGen/instrprof_basic.swift

@@ -32,7 +32,7 @@ func basic(a : Int32) {
   }
 
   // CHECK: builtin "int_instrprof_increment"
-  for var i: Int32 = 0; i < a; ++i {
+  for i in 0 ..< a {
   }
 
   // CHECK: builtin "int_instrprof_increment"

Diff for: test/SILGen/sil_locations.swift

@@ -5,7 +5,7 @@
 func ifexpr() -> Int {
   var x : Int = 0
   if true {
-    x++; 
+    x+=1
   }
   return x
   // CHECK-LABEL: sil hidden  @_TF13sil_locations6ifexprFT_Si
@@ -18,9 +18,9 @@ func ifexpr() -> Int {
 func ifelseexpr() -> Int {
   var x : Int = 0
   if true {
-    x++; 
+    x+=1
   } else {
-    x--;
+    x-=1
   }
   return x
   // CHECK-LABEL: sil hidden  @_TF13sil_locations10ifelseexprFT_Si
@@ -62,15 +62,15 @@ func ifexpr_rval() -> Int {
   // CHECK: br bb{{[0-9]+}}({{%.*}}), loc "{{.*}}":[[@LINE-8]]:22
 }
 
-// TODO: missing info on the first branch.
-func forstmt_empty_cond(_ i: Int) -> Int {
-  for var i=0;;++i {}
-    // CHECK-LABEL: sil hidden  @{{.*}}forstmt_empty_cond{{.*}}
-    // CHECK: apply {{.*}}, loc "{{.*}}":[[@LINE-2]]:13
-    // CHECK: br [[TRUE_BB:bb[0-9]+]]
-    // CHECK: [[TRUE_BB:bb[0-9]+]]:
-    // CHECK: br [[TRUE_BB:bb[0-9]+]], loc "{{.*}}":[[@LINE-5]]:21
-}
+
+
+
+
+
+
+
+
+
 
 // --- Test function calls.
 func simpleDirectCallTest(_ i: Int) -> Int {
@@ -116,7 +116,7 @@ func multipleReturnsImplicitAndExplicit() {
   if x > 10 {
     return
   }
-  x++;
+  x += 1
   // CHECK-LABEL: sil hidden  @_TF13sil_locations34multipleReturnsImplicitAndExplicitFT_T_
   // CHECK: cond_br
   // CHECK: br bb{{[0-9]+}}, loc "{{.*}}":[[@LINE-5]]:5, {{.*}}:return
@@ -175,13 +175,13 @@ func testIf() {
 }
 
 func testFor() {
-  for (var i:Int = 0; i<10; i++) {
+  for i in 0..<10 {
     var y: Int = 300
-    y++;
+    y+=1
     if true {
       break
     }
-    y--;
+    y-=1
     continue
   }
 
@@ -350,9 +350,9 @@ func testStringForEachStmt() {
 
 
 func testForStmt() {
-  var i = 0
+  
   var m = 0
-  for (i = 0; i < 10; ++i) {
+  for i in 0..<10 {
     m += 1
     if m == 15 {
       break
@@ -363,19 +363,19 @@ func testForStmt() {
   }
 
 
-  // CHECK-LABEL: sil hidden @_TF13sil_locations11testForStmtFT_T_
-  // CHECK: br {{.*}} line:[[@LINE-12]]:3
-  // CHECK: cond_br {{.*}} line:[[@LINE-13]]:15
-  // CHECK: cond_br {{.*}} line:[[@LINE-12]]:8
-  // Break branch:
-  // CHECK: br {{.*}} line:[[@LINE-13]]:7
-  // Continue branch:
-  // CHECK: br {{.*}} line:[[@LINE-13]]:7
-  // Looping back branch:
-  // CHECK: br {{.*}} line:[[@LINE-12]]:3
-  // Condition is false branch:
-  // CHECK: br {{.*}} line:[[@LINE-22]]:3
 
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
 }