From 59ededb795732e04ac8e1eaceb2b1509a1c1cc23 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 20 Aug 2019 22:00:59 -0400
Subject: WIP: Make new-luxc instructions rely on the Descriptor type.

---
 new-luxc/source/luxc/lang/translation/jvm/reference.lux | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/jvm/reference.lux')

diff --git a/new-luxc/source/luxc/lang/translation/jvm/reference.lux b/new-luxc/source/luxc/lang/translation/jvm/reference.lux
index 5fb0e0d63..8352c7d6f 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/reference.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/reference.lux
@@ -5,6 +5,9 @@
    [data
     [text
      ["%" format (#+ format)]]]
+   [target
+    [jvm
+     ["." descriptor]]]
    [tool
     [compiler
      ["." name]
@@ -32,9 +35,9 @@
   (do phase.monad
     [function-class generation.context]
     (wrap (|>> (_.ALOAD 0)
-               (_.GETFIELD function-class
+               (_.GETFIELD (descriptor.class function-class)
                            (|> variable .nat foreign-name)
-                           //.$Object)))))
+                           //.$Value)))))
 
 (def: local
   (-> Register Inst)
@@ -53,4 +56,4 @@
   (-> Name (Operation Inst))
   (do phase.monad
     [bytecode-name (generation.remember name)]
-    (wrap (_.GETSTATIC bytecode-name //.value-field //.$Object))))
+    (wrap (_.GETSTATIC (descriptor.class bytecode-name) //.value-field //.$Value))))
-- 
cgit v1.2.3