File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed
branches/try/src/librustc/middle/typeck/infer/region_inference Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 2
2
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5
- refs/heads/try: 0a0ce8d227ceedd53924ce0a9afbac8d5604e3cb
5
+ refs/heads/try: bdfd0b5ae081240697fb087f59c42ab9ba070bef
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
8
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
Original file line number Diff line number Diff line change @@ -93,7 +93,7 @@ pub struct RegionVarBindings {
93
93
lubs : CombineMap ,
94
94
glbs : CombineMap ,
95
95
skolemization_count : Cell < uint > ,
96
- bound_count : uint ,
96
+ bound_count : Cell < uint > ,
97
97
98
98
// The undo log records actions that might later be undone.
99
99
//
@@ -119,7 +119,7 @@ pub fn RegionVarBindings(tcx: ty::ctxt) -> RegionVarBindings {
119
119
lubs : HashMap :: new ( ) ,
120
120
glbs : HashMap :: new ( ) ,
121
121
skolemization_count : Cell :: new ( 0 ) ,
122
- bound_count : 0 ,
122
+ bound_count : Cell :: new ( 0 ) ,
123
123
undo_log : ~[ ]
124
124
}
125
125
}
@@ -212,10 +212,10 @@ impl RegionVarBindings {
212
212
// changing the representation of bound regions in a fn
213
213
// declaration
214
214
215
- let sc = self . bound_count ;
216
- self . bound_count += 1 ;
215
+ let sc = self . bound_count . get ( ) ;
216
+ self . bound_count . set ( sc + 1 ) ;
217
217
218
- if sc >= self . bound_count {
218
+ if sc >= self . bound_count . get ( ) {
219
219
self . tcx . sess . bug ( "Rollover in RegionInference new_bound()" ) ;
220
220
}
221
221
You can’t perform that action at this time.
0 commit comments