siddhesh / rpms / luajit

Forked from rpms/luajit 5 years ago
Clone
Blob Blame History Raw
From 02b521981a1ab919ff2cd4d9bcaee80baf77dce2 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Sun, 22 Apr 2018 13:27:25 +0200
Subject: [PATCH 37/72] FFI: Add tonumber() specialization for failed
 conversions.

Contributed by Javier Guerra Giraldez.
---
 src/lj_crecord.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lj_crecord.c b/src/lj_crecord.c
index 84fc49e..bc88d63 100644
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -1661,6 +1661,8 @@ void LJ_FASTCALL lj_crecord_tonumber(jit_State *J, RecordFFData *rd)
       d = ctype_get(cts, CTID_DOUBLE);
     J->base[0] = crec_ct_tv(J, d, 0, J->base[0], &rd->argv[0]);
   } else {
+    /* Specialize to the ctype that couldn't be converted. */
+    argv2cdata(J, J->base[0], &rd->argv[0]);
     J->base[0] = TREF_NIL;
   }
 }
-- 
2.20.1