@@ -35,7 +35,8 @@ object Normalizer { normal =>
3535 exprs : Map [Id , Expr ],
3636 decls : DeclarationContext , // for field selection
3737 usage : mutable.Map [Id , Usage ], // mutable in order to add new information after renaming
38- maxInlineSize : Int // to control inlining and avoid code bloat
38+ maxInlineSize : Int , // to control inlining and avoid code bloat
39+ preserveBoxing : Boolean // for LLVM, prevents some optimizations
3940 ) {
4041 def bind (id : Id , expr : Expr ): Context = copy(exprs = exprs + (id -> expr))
4142 def bind (id : Id , block : Block ): Context = copy(blocks = blocks + (id -> block))
@@ -65,14 +66,14 @@ object Normalizer { normal =>
6566 case None => false
6667 }
6768
68- def normalize (entrypoints : Set [Id ], m : ModuleDecl , maxInlineSize : Int ): ModuleDecl = {
69+ def normalize (entrypoints : Set [Id ], m : ModuleDecl , maxInlineSize : Int , preserveBoxing : Boolean ): ModuleDecl = {
6970 // usage information is used to detect recursive functions (and not inline them)
7071 val usage = Reachable (entrypoints, m)
7172
7273 val defs = m.definitions.collect {
7374 case Toplevel .Def (id, block) => id -> block
7475 }.toMap
75- val context = Context (defs, Map .empty, DeclarationContext (m.declarations, m.externs), mutable.Map .from(usage), maxInlineSize)
76+ val context = Context (defs, Map .empty, DeclarationContext (m.declarations, m.externs), mutable.Map .from(usage), maxInlineSize, preserveBoxing )
7677
7778 val (normalizedDefs, _) = normalizeToplevel(m.definitions)(using context)
7879 m.copy(definitions = normalizedDefs)
@@ -138,10 +139,10 @@ object Normalizer { normal =>
138139
139140 // TODO for `New` we should track how often each operation is used, not the object itself
140141 // to decide inlining.
141- private def shouldInline (b : BlockLit , boundBy : Option [BlockVar ])(using C : Context ): Boolean = boundBy match {
142+ private def shouldInline (b : BlockLit , boundBy : Option [BlockVar ], blockArgs : List [ Block ] )(using C : Context ): Boolean = boundBy match {
142143 case Some (id) if isRecursive(id.id) => false
143144 case Some (id) => isOnce(id.id) || b.body.size <= C .maxInlineSize
144- case None => true
145+ case _ => blockArgs.exists { b => b. isInstanceOf [ BlockLit ] } // higher-order function with known arg
145146 }
146147
147148 private def active (e : Expr )(using Context ): Expr =
@@ -171,7 +172,7 @@ object Normalizer { normal =>
171172 // -------
172173 case Stmt .App (b, targs, vargs, bargs) =>
173174 active(b) match {
174- case NormalizedBlock .Known (b : BlockLit , boundBy) if shouldInline(b, boundBy) =>
175+ case NormalizedBlock .Known (b : BlockLit , boundBy) if shouldInline(b, boundBy, bargs ) =>
175176 reduce(b, targs, vargs.map(normalize), bargs.map(normalize))
176177 case normalized =>
177178 Stmt .App (normalized.shared, targs, vargs.map(normalize), bargs.map(normalize))
@@ -181,7 +182,7 @@ object Normalizer { normal =>
181182 active(b) match {
182183 case n @ NormalizedBlock .Known (Block .New (impl), boundBy) =>
183184 selectOperation(impl, method) match {
184- case b : BlockLit if shouldInline(b, boundBy) => reduce(b, targs, vargs.map(normalize), bargs.map(normalize))
185+ case b : BlockLit if shouldInline(b, boundBy, bargs ) => reduce(b, targs, vargs.map(normalize), bargs.map(normalize))
185186 case _ => Stmt .Invoke (n.shared, method, methodTpe, targs, vargs.map(normalize), bargs.map(normalize))
186187 }
187188
@@ -213,6 +214,14 @@ object Normalizer { normal =>
213214
214215 def normalizeVal (id : Id , tpe : ValueType , binding : Stmt , body : Stmt ): Stmt = normalize(binding) match {
215216
217+ // [[ val x = ABORT; body ]] = ABORT
218+ case abort if ! C .preserveBoxing && abort.tpe == Type .TBottom =>
219+ abort
220+
221+ case abort @ Stmt .Shift (p, BlockLit (tparams, cparams, vparams, List (k), body))
222+ if ! C .preserveBoxing && ! Variables .free(body).containsBlock(k.id) =>
223+ abort
224+
216225 // [[ val x = sc match { case id(ps) => body2 }; body ]] = sc match { case id(ps) => val x = body2; body }
217226 case Stmt .Match (sc, List ((id2, BlockLit (tparams2, cparams2, vparams2, bparams2, body2))), None ) =>
218227 Stmt .Match (sc, List ((id2, BlockLit (tparams2, cparams2, vparams2, bparams2,
0 commit comments