auto merge of #4896 : pcwalton/rust/move-speedup, r=pcwalton
r? @nikomatsakis When you made the change to fix kinds in recursion, you stopped looking in the master cache. This patch fixes it.
This commit is contained in:
commit
1a394e57f7
@ -1932,6 +1932,10 @@ pub fn type_contents(cx: ctxt, ty: t) -> TypeContents {
|
||||
Some(tc) => { return *tc; }
|
||||
None => {}
|
||||
}
|
||||
match cx.tc_cache.find(&ty_id) { // Must check both caches!
|
||||
Some(tc) => { return *tc; }
|
||||
None => {}
|
||||
}
|
||||
cache.insert(ty_id, TC_NONE);
|
||||
|
||||
debug!("computing contents of %s", ty_to_str(cx, ty));
|
||||
|
Loading…
Reference in New Issue
Block a user