Fix query cycle when encounter unevaluated const#148698

bors merged 2 commits intorust-lang:mainrust-lang/rust:mainfrom

tiif:const_query_cycletiif/rust:const_query_cycleCopy head branch name to clipboard