From 55be62041f50995f48126bedc07a01489cd15da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 18 Oct 2019 14:27:56 +0200
Subject: [PATCH] Compiler: object->program_id only exists --with-debug.
---
src/las.c | 2 ++
src/program.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/las.c b/src/las.c
index 4152355b65..8778bc5bd9 100644
--- a/src/las.c
+++ b/src/las.c
@@ -3152,9 +3152,11 @@ static struct pike_string *get_name_of_function(node *n)
name = n->u.sval.u.efun->name;
} else {
struct program *p = n->u.sval.u.object->prog;
+#ifdef PIKE_DEBUG
if (!p) {
p = id_to_program(n->u.sval.u.object->program_id);
}
+#endif
if (p) {
name = ID_FROM_INT(p, SUBTYPEOF(n->u.sval))->name;
} else {
diff --git a/src/program.c b/src/program.c
index 7dcb64f473..b69231d29d 100644
--- a/src/program.c
+++ b/src/program.c
@@ -8347,7 +8347,9 @@ static int run_pass1(struct compilation *c)
}else{
free_program(c->placeholder->prog);
add_ref(c->placeholder->prog=Pike_compiler->new_program);
+#ifdef PIKE_DEBUG
c->placeholder->program_id = Pike_compiler->new_program->id;
+#endif
debug_malloc_touch(c->placeholder);
}
}
--
GitLab