Skip to content

Commit 256c7b2

Browse files
authored
Do not report unchanged name resolution environment (#15538)
1 parent a9564ad commit 256c7b2

1 file changed

Lines changed: 17 additions & 15 deletions

File tree

src/Compiler/Checking/CheckExpressions.fs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -203,27 +203,27 @@ let AddLocalValPrimitive g (v: Val) env =
203203

204204
/// Add a table of local values to TcEnv
205205
let AddLocalValMap g tcSink scopem (vals: Val NameMap) env =
206-
let env =
207-
if vals.IsEmpty then
208-
env
209-
else
206+
if vals.IsEmpty then
207+
env
208+
else
209+
let env =
210210
{ env with
211211
eNameResEnv = AddValMapToNameEnv g vals env.eNameResEnv
212212
eUngeneralizableItems = NameMap.foldBackRange (typeOfVal >> addFreeItemOfTy) vals env.eUngeneralizableItems }
213-
CallEnvSink tcSink (scopem, env.NameEnv, env.AccessRights)
214-
env
213+
CallEnvSink tcSink (scopem, env.NameEnv, env.AccessRights)
214+
env
215215

216216
/// Add a list of local values to TcEnv and report them to the sink
217217
let AddLocalVals g tcSink scopem (vals: Val list) env =
218-
let env =
219-
if isNil vals then
220-
env
221-
else
218+
if isNil vals then
219+
env
220+
else
221+
let env =
222222
{ env with
223223
eNameResEnv = AddValListToNameEnv g vals env.eNameResEnv
224224
eUngeneralizableItems = List.foldBack (typeOfVal >> addFreeItemOfTy) vals env.eUngeneralizableItems }
225-
CallEnvSink tcSink (scopem, env.NameEnv, env.AccessRights)
226-
env
225+
CallEnvSink tcSink (scopem, env.NameEnv, env.AccessRights)
226+
env
227227

228228
/// Add a local value to TcEnv and report it to the sink
229229
let AddLocalVal g tcSink scopem v env =
@@ -235,9 +235,11 @@ let AddLocalVal g tcSink scopem v env =
235235

236236
/// Add a set of explicitly declared type parameters as being available in the TcEnv
237237
let AddDeclaredTypars check typars env =
238-
if isNil typars then env else
239-
let env = { env with eNameResEnv = AddDeclaredTyparsToNameEnv check env.eNameResEnv typars }
240-
{ env with eUngeneralizableItems = List.foldBack (mkTyparTy >> addFreeItemOfTy) typars env.eUngeneralizableItems }
238+
if isNil typars then
239+
env
240+
else
241+
let env = { env with eNameResEnv = AddDeclaredTyparsToNameEnv check env.eNameResEnv typars }
242+
{ env with eUngeneralizableItems = List.foldBack (mkTyparTy >> addFreeItemOfTy) typars env.eUngeneralizableItems }
241243

242244
/// Environment of implicitly scoped type parameters, e.g. 'a in "(x: 'a)"
243245

0 commit comments

Comments
 (0)