@@ -197,20 +197,20 @@ private class ExtractExpression(config: ExpressionCompilerConfig, expressionStor
197197 else nullLiteral
198198
199199 private def getThis (tree : Tree )(cls : ClassSymbol )(using Context ): Tree =
200- reflectEval(tree)(nullLiteral, ReflectEvalStrategy .This (cls), List .empty, expressionStore.classOwners.head.typeRef )
200+ reflectEval(tree)(nullLiteral, ReflectEvalStrategy .This (cls), List .empty)
201201
202202 private def getLocalOuter (tree : Tree )(outerCls : ClassSymbol )(using Context ): Tree =
203203 val strategy = ReflectEvalStrategy .LocalOuter (outerCls)
204- reflectEval(tree)(nullLiteral, strategy, List .empty, outerCls.typeRef )
204+ reflectEval(tree)(nullLiteral, strategy, List .empty)
205205
206206 private def getOuter (tree : Tree )(qualifier : Tree , outerCls : ClassSymbol )(using Context ): Tree =
207207 val strategy = ReflectEvalStrategy .Outer (outerCls)
208- reflectEval(tree)(qualifier, strategy, List .empty, outerCls.typeRef )
208+ reflectEval(tree)(qualifier, strategy, List .empty)
209209
210210 private def getLocalValue (tree : Tree )(variable : Symbol )(using Context ): Tree =
211211 val isByName = isByNameParam(variable.info)
212212 val strategy = ReflectEvalStrategy .LocalValue (variable.asTerm, isByName)
213- reflectEval(tree)(nullLiteral, strategy, List .empty, tree.tpe )
213+ reflectEval(tree)(nullLiteral, strategy, List .empty)
214214
215215 private def isByNameParam (tpe : Type )(using Context ): Boolean =
216216 tpe match
@@ -220,56 +220,55 @@ private class ExtractExpression(config: ExpressionCompilerConfig, expressionStor
220220
221221 private def setLocalValue (tree : Tree )(variable : Symbol , rhs : Tree )(using Context ): Tree =
222222 val strategy = ReflectEvalStrategy .LocalValueAssign (variable.asTerm)
223- reflectEval(tree)(nullLiteral, strategy, List (rhs), tree.tpe )
223+ reflectEval(tree)(nullLiteral, strategy, List (rhs))
224224
225225 private def getClassCapture (tree : Tree )(variable : Symbol , cls : ClassSymbol )(using Context ): Tree =
226226 val byName = isByNameParam(variable.info)
227227 val strategy = ReflectEvalStrategy .ClassCapture (variable.asTerm, cls, byName)
228228 val qualifier = thisOrOuterValue(tree)(cls)
229- reflectEval(tree)(qualifier, strategy, List .empty, tree.tpe )
229+ reflectEval(tree)(qualifier, strategy, List .empty)
230230
231231 private def setClassCapture (tree : Tree )(variable : Symbol , cls : ClassSymbol , value : Tree )(using Context ) =
232232 val strategy = ReflectEvalStrategy .ClassCaptureAssign (variable.asTerm, cls)
233233 val qualifier = thisOrOuterValue(tree)(cls)
234- reflectEval(tree)(qualifier, strategy, List (value), tree.tpe )
234+ reflectEval(tree)(qualifier, strategy, List (value))
235235
236236 private def getMethodCapture (tree : Tree )(variable : Symbol , method : TermSymbol )(using Context ): Tree =
237237 val isByName = isByNameParam(variable.info)
238238 val strategy =
239239 ReflectEvalStrategy .MethodCapture (variable.asTerm, method.asTerm, isByName)
240- reflectEval(tree)(nullLiteral, strategy, List .empty, tree.tpe )
240+ reflectEval(tree)(nullLiteral, strategy, List .empty)
241241
242242 private def setMethodCapture (tree : Tree )(variable : Symbol , method : Symbol , value : Tree )(using Context ) =
243243 val strategy =
244244 ReflectEvalStrategy .MethodCaptureAssign (variable.asTerm, method.asTerm)
245- reflectEval(tree)(nullLiteral, strategy, List (value), tree.tpe )
245+ reflectEval(tree)(nullLiteral, strategy, List (value))
246246
247247 private def getStaticObject (tree : Tree )(obj : Symbol )(using ctx : Context ): Tree =
248248 val strategy = ReflectEvalStrategy .StaticObject (obj.asClass)
249- reflectEval(tree)(nullLiteral, strategy, List .empty, obj.typeRef )
249+ reflectEval(tree)(nullLiteral, strategy, List .empty)
250250
251251 private def getField (tree : Tree )(qualifier : Tree , field : TermSymbol )(using Context ): Tree =
252252 val byName = isByNameParam(field.info)
253253 val strategy = ReflectEvalStrategy .Field (field, byName)
254- reflectEval(tree)(qualifier, strategy, List .empty, tree.tpe )
254+ reflectEval(tree)(qualifier, strategy, List .empty)
255255
256256 private def setField (tree : Tree )(qualifier : Tree , field : TermSymbol , rhs : Tree )(using Context ): Tree =
257257 val strategy = ReflectEvalStrategy .FieldAssign (field)
258- reflectEval(tree)(qualifier, strategy, List (rhs), tree.tpe )
258+ reflectEval(tree)(qualifier, strategy, List (rhs))
259259
260260 private def callMethod (tree : Tree )(qualifier : Tree , method : TermSymbol , args : List [Tree ])(using Context ): Tree =
261261 val strategy = ReflectEvalStrategy .MethodCall (method)
262- reflectEval(tree)(qualifier, strategy, args, tree.tpe )
262+ reflectEval(tree)(qualifier, strategy, args)
263263
264264 private def callConstructor (tree : Tree )(qualifier : Tree , ctr : TermSymbol , args : List [Tree ])(using Context ): Tree =
265265 val strategy = ReflectEvalStrategy .ConstructorCall (ctr, ctr.owner.asClass)
266- reflectEval(tree)(qualifier, strategy, args, tree.tpe )
266+ reflectEval(tree)(qualifier, strategy, args)
267267
268268 private def reflectEval (tree : Tree )(
269269 qualifier : Tree ,
270270 strategy : ReflectEvalStrategy ,
271- args : List [Tree ],
272- tpe : Type
271+ args : List [Tree ]
273272 )(using Context ): Tree =
274273 val evalArgs = List (
275274 qualifier,
0 commit comments