Now inlining the pattern-matching POP and PEEK operations.

1 files changed, 9 insertions, 11 deletions

diff --git a/new-luxc/source/luxc/lang/translation/jvm/runtime.lux b/new-luxc/source/luxc/lang/translation/jvm/runtime.lux
index fa250e2bf..175a60e80 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/runtime.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/runtime.lux
@@ -132,6 +132,15 @@
                         (_.wrap #$t.Double))))
        ))
 
+(def: #export popI
+  (|>> (_.int +0)
+       _.AALOAD
+       (_.CHECKCAST ($t.descriptor $Stack))))
+
+(def: #export peekI
+  (|>> (_.int +1)
+       _.AALOAD))
+
 (def: pm-methods
   Def
   (let [tuple-sizeI (|>> (_.ALOAD 0) _.ARRAYLENGTH)
@@ -171,17 +180,6 @@
                          (_.ALOAD 1)
                          _.AASTORE
                          _.ARETURN))
-         ($d.method #$.Public $.staticM "pm_pop" ($t.method (list $Stack) (#.Some $Stack) (list))
-                    (|>> (_.ALOAD 0)
-                         (_.int +0)
-                         _.AALOAD
-                         (_.CHECKCAST ($t.descriptor $Stack))
-                         _.ARETURN))
-         ($d.method #$.Public $.staticM "pm_peek" ($t.method (list $Stack) (#.Some $Object) (list))
-                    (|>> (_.ALOAD 0)
-                         (_.int +1)
-                         _.AALOAD
-                         _.ARETURN))
          ($d.method #$.Public $.staticM "pm_variant" ($t.method (list $Variant $Tag $Flag) (#.Some $Object) (list))
                     (<| _.with-label (function (_ @loop))
                         _.with-label (function (_ @just-return))