From 5938212748636d21d6f4b372481ab3b6dd6c7538 Mon Sep 17 00:00:00 2001
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Mon, 28 Sep 2009 13:32:50 -0300
Subject: information about upvalues (where they come from) kept in Proto
 structure, instead of sequence of pseudo-opcodes after OP_CLOSURE

---
 ldebug.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'ldebug.c')

diff --git a/ldebug.c b/ldebug.c
index 00ab2284..80d367cd 100644
--- a/ldebug.c
+++ b/ldebug.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.c,v 2.54 2009/09/23 20:33:05 roberto Exp roberto $
+** $Id: ldebug.c,v 2.55 2009/09/28 12:37:17 roberto Exp roberto $
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
@@ -328,7 +328,8 @@ static const char *getobjname (lua_State *L, CallInfo *ci, int reg,
       case OP_GETUPVAL: {
         if (reg == a) {
           int u = GETARG_B(i);  /* upvalue index */
-          *name = p->upvalues ? getstr(p->upvalues[u]) : "?";
+          TString *tn = p->upvalues[u].name;
+          *name = tn ? getstr(tn) : "?";
           what = "upvalue";
         }
         break;
@@ -364,12 +365,6 @@ static const char *getobjname (lua_State *L, CallInfo *ci, int reg,
           pc += b;  /* do the jump */
         break;
       }
-      case OP_CLOSURE: {
-        int nup = p->p[GETARG_Bx(i)]->nups;
-        pc += nup;  /* do not 'execute' pseudo-instructions */
-        lua_assert(pc <= lastpc);
-        break;
-      }
       default:
         if (testAMode(op) && reg == a) what = NULL;
         break;
-- 
cgit v1.2.3-55-g6feb