Revert "remove alias analysis and replace with borrowck"

18s perf regression compiling rustc with opts

This reverts commit 7f6ee0ce0d.

src/test/compile-fail/borrowck-assign-comp-idx.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 type point = { x: int, y: int };
 
 fn a() {

src/test/compile-fail/borrowck-assign-comp.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 type point = { x: int, y: int };
 
 fn a() {

src/test/compile-fail/borrowck-lend-args.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn borrow(_v: &int) {}
 
 fn borrow_from_arg_imm_ref(&&v: ~int) {

src/test/compile-fail/borrowck-lend-flow.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 // Note: the borrowck analysis is currently flow-insensitive.
 // Therefore, some of these errors are marked as spurious and could be
 // corrected by a simple change to the analysis.  The others are

src/test/compile-fail/borrowck-loan-blocks-move-cc.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn borrow(v: &int, f: fn(x: &int)) {
     f(v);
 }

src/test/compile-fail/borrowck-loan-blocks-move.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn take(-_v: ~int) {
 }
 

src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn borrow(v: &int, f: fn(x: &int)) {
     f(v);
 }

src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 type point = { x: int, y: int };
 
 impl foo for point {

src/test/compile-fail/borrowck-loan-rcvr.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 type point = { x: int, y: int };
 
 impl foo for point {

src/test/compile-fail/borrowck-loan-vec-content.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 // Here we check that it is allowed to lend out an element of a
 // (locally rooted) mutable, unique vector, and that we then prevent
 // modifications to the contents.

src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn want_slice(v: [int]/&) -> int {
     let mut sum = 0;
     for vec::each(v) { |i| sum += i; }

src/test/compile-fail/borrowck-no-cycle-in-exchange-heap.rs

@@ -1,13 +0,0 @@
-enum cycle {
-    node({mut a: ~cycle}),
-    empty
-}
-fn main() {
-    let x = ~node({mut a: ~empty});
-    // Create a cycle!
-    alt check *x { //! NOTE loan of immutable local variable granted here
-      node(y) {
-        y.a <- x; //! ERROR moving out of immutable local variable prohibited due to outstanding loan
-      }
-    };
-}

src/test/compile-fail/borrowck-pat-enum-in-box.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn match_imm_box(v: &const @option<int>) -> int {
     alt *v {
       @some(i) {i}

src/test/compile-fail/borrowck-pat-enum.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn match_ref(&&v: option<int>) -> int {
     alt v {
       some(i) {

src/test/compile-fail/borrowck-pat-reassign-binding.rs

@@ -1,3 +1,5 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
 // xfail-pretty -- comments are infaithfully preserved
 
 fn main() {

src/test/compile-fail/borrowck-pat-reassign-sometimes-binding.rs

@@ -1,3 +1,5 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
 // xfail-pretty -- comments are infaithfully preserved
 
 fn main() {

src/test/compile-fail/borrowck-pure-scope-in-call.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 pure fn pure_borrow(_x: &int, _y: ()) {}
 
 fn test1(x: @mut ~int) {

src/test/compile-fail/borrowck-unchecked-with-borrow.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn impure(_i: int) {}
 
 // check that unchecked alone does not override borrowck:

src/test/compile-fail/borrowck-uniq-via-box.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn borrow(_v: &int) {}
 
 fn box_mut(v: @mut ~int) {

src/test/compile-fail/borrowck-uniq-via-lend.rs

@@ -1,3 +1,6 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
+
 fn borrow(_v: &int) {}
 
 fn local() {

src/test/compile-fail/borrowck-uniq-via-ref.rs

@@ -1,3 +1,5 @@
+// xfail-fast  (compile-flags unsupported on windows)
+// compile-flags:--borrowck=err
 fn borrow(_v: &int) {}
 
 fn box_mut(v: &mut ~int) {

src/test/compile-fail/issue-511.rs

@@ -8,6 +8,8 @@ fn f<T>(&o: option<T>) {
 fn main() {
     f::<int>(option::none);
     //!^ ERROR taking mut reference to static item
-    //!^^ ERROR illegal borrow unless pure: creating mutable alias to aliasable, immutable memory
-    //!^^^ NOTE impure due to access to impure function
+
+    // Additional errors reported by borrowck:
+    //^^ ERROR illegal borrow unless pure: creating mutable alias to aliasable, immutable memory
+    //^^^ NOTE impure due to access to impure function
 }

src/test/compile-fail/unsafe-alias-2.rs

@@ -0,0 +1,8 @@
+// error-pattern:invalidate reference x
+
+fn whoknows(x: @mut {mut x: int}) { x.x = 10; }
+
+fn main() {
+    let box = @mut {mut x: 1};
+    alt *box { x { whoknows(box); log(error, x); } }
+}

src/test/compile-fail/unsafe-alias.rs

@@ -0,0 +1,10 @@
+// error-pattern:may alias with argument
+
+fn foo(x: {mut x: int}, f: fn@()) { log(debug, x); }
+
+fn whoknows(x: @mut {mut x: int}) { *x = {mut x: 10}; }
+
+fn main() {
+    let box = @mut {mut x: 1};
+    foo(*box, bind whoknows(box));
+}

src/test/compile-fail/unsafe-alt.rs

@@ -0,0 +1,8 @@
+// error-pattern:invalidate reference i
+
+enum foo { left({mut x: int}), right(bool) }
+
+fn main() {
+    let mut x = left({mut x: 10});
+    alt x { left(i) { x = right(false); copy x; log(debug, i); } _ { } }
+}

src/test/compile-fail/unsafe-mutable-alias.rs

@@ -0,0 +1,8 @@
+// error-pattern:mut reference to a variable that roots another reference
+
+fn f(a: {mut x: int}, &b: {mut x: int}) -> int {
+    b.x += 1;
+    ret a.x + b.x;
+}
+
+fn main() { let i = {mut x: 4}; log(debug, f(i, i)); }