issue #107 add type check in lua_upvaluejoin()

ravi-tests/ravi_tests1.ravi

@@ -1394,6 +1394,55 @@ compile(test_longkey);
 assert(pcall(test_yields_in_metamethods));
 print 'Test 54 Ok'
 
+function test_upvaluejoin()
+  local debug = require'debug'
+  local foo1, foo2, foo3, foo4
+  do
+    local a:integer, b:integer = 3, 5
+    local c:number = 7.1
+    foo1 = function() return a+b end
+    foo2 = function() return b+a end
+    foo4 = function() return c end
+    do
+      local a: integer = 10
+      foo3 = function() return a+b end
+    end
+  end
+
+  assert(debug.upvalueid(foo1, 1))
+  assert(debug.upvalueid(foo1, 2))
+  assert(not pcall(debug.upvalueid, foo1, 3))
+  assert(debug.upvalueid(foo1, 1) == debug.upvalueid(foo2, 2))
+  assert(debug.upvalueid(foo1, 2) == debug.upvalueid(foo2, 1))
+  assert(debug.upvalueid(foo3, 1))
+  assert(debug.upvalueid(foo1, 1) ~= debug.upvalueid(foo3, 1))
+  assert(debug.upvalueid(foo1, 2) == debug.upvalueid(foo3, 2))
+
+  assert(debug.upvalueid(string.gmatch("x", "x"), 1) ~= nil)
+
+  assert(foo1() == 3 + 5 and foo2() == 5 + 3)
+  debug.upvaluejoin(foo1, 2, foo2, 2)
+  assert(foo1() == 3 + 3 and foo2() == 5 + 3)
+  assert(foo3() == 10 + 5)
+  debug.upvaluejoin(foo3, 2, foo2, 1)
+  assert(foo3() == 10 + 5)
+  debug.upvaluejoin(foo3, 2, foo2, 2)
+  assert(foo3() == 10 + 3)
+  -- Following will fail as typeof(foo4,1) is not same as typeof(foo1,1)
+  debug.upvaluejoin(foo4, 1, foo1, 1)
+  assert(foo4() == 7.1)
+  assert(not pcall(debug.upvaluejoin, foo1, 3, foo2, 1))
+  assert(not pcall(debug.upvaluejoin, foo1, 1, foo2, 3))
+  assert(not pcall(debug.upvaluejoin, foo1, 0, foo2, 1))
+  assert(not pcall(debug.upvaluejoin, print, 1, foo2, 1))
+  assert(not pcall(debug.upvaluejoin, {}, 1, foo2, 1))
+  assert(not pcall(debug.upvaluejoin, foo1, 1, print, 1))
+end
+assert(pcall(test_upvaluejoin));
+compile(test_upvaluejoin);
+assert(pcall(test_upvaluejoin));
+print 'Test 55 Ok'
+
 
 for k,v in pairs(opcodes_coverage)
 do

src/lapi.c

@@ -1594,12 +1594,13 @@ LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
 }
 
 
-static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) {
+static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf, ravitype_t *type) {
   LClosure *f;
   StkId fi = index2addr(L, fidx);
   api_check(L, ttisLclosure(fi), "Lua function expected");
   f = clLvalue(fi);
   api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index");
+  if (type) *type = f->p->upvalues[n - 1].type;
   if (pf) *pf = f;
   return &f->upvals[n - 1];  /* get its upvalue pointer */
 }
@@ -1609,7 +1610,7 @@ LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) {
   StkId fi = index2addr(L, fidx);
   switch (ttype(fi)) {
     case LUA_TLCL: {  /* lua closure */
-      return *getupvalref(L, fidx, n, NULL);
+      return *getupvalref(L, fidx, n, NULL, NULL);
     }
     case LUA_TCCL: {  /* C closure */
       CClosure *f = clCvalue(fi);
@@ -1627,13 +1628,16 @@ LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) {
 LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
                                             int fidx2, int n2) {
   LClosure *f1;
-  UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
-  UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
-  luaC_upvdeccount(L, *up1);
-  *up1 = *up2;
-  (*up1)->refcount++;
-  if (upisopen(*up1)) (*up1)->u.open.touched = 1;
-  luaC_upvalbarrier(L, *up1);
+  ravitype_t t1, t2;
+  UpVal **up1 = getupvalref(L, fidx1, n1, &f1, &t1);
+  UpVal **up2 = getupvalref(L, fidx2, n2, NULL, &t2);
+  if (t1 == t2) {
+    luaC_upvdeccount(L, *up1);
+    *up1 = *up2;
+    (*up1)->refcount++;
+    if (upisopen(*up1)) (*up1)->u.open.touched = 1;
+    luaC_upvalbarrier(L, *up1);
+  }
 }
 
 /* API to set the output functions used by Lua / Ravi