[PATCH] fix cast to pointer to floating-point

[PATCH] fix cast to pointer to floating-point

[Luc Van Oostenryck]

By mistake, a cast to floating-pointer pointer was
created as OP_FPCAST instead of OP_PTRCAST.

Fix this by adding the missing 'else'.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
 linearize.c                |  3 +--
 validation/fp-vs-ptrcast.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 validation/fp-vs-ptrcast.c

diff --git a/linearize.c b/linearize.c
index 255231c60..6397f68a7 100644
--- a/linearize.c
+++ b/linearize.c
@@ -1119,8 +1119,7 @@ static struct instruction *alloc_cast_instruction(struct symbol *src, struct sym
 		base = base->ctype.base_type;
 		if (base != &void_ctype)
 			opcode = OP_PTRCAST;
-	}
-	if (base->ctype.base_type == &fp_type)
+	} else if (base->ctype.base_type == &fp_type)
 		opcode = OP_FPCAST;
 	return alloc_typed_instruction(opcode, ctype);
 }
diff --git a/validation/fp-vs-ptrcast.c b/validation/fp-vs-ptrcast.c
new file mode 100644
index 000000000..817aee5c9
--- /dev/null
+++ b/validation/fp-vs-ptrcast.c
@@ -0,0 +1,13 @@
+float *f01(void* p)
+{
+	return p;
+}
+
+/*
+ * check-name: fp-vs-ptrcast
+ * check-command: test-linearize -Wno-decl $file
+ * check-output-ignore
+ *
+ * check-output-excludes: fpcast
+ * check-output-contains: ptrcast
+ */
-- 
2.11.1

Re: [PATCH] fix cast to pointer to floating-point

[Christopher Li]

On Sat, Mar 11, 2017 at 10:16 PM, Luc Van Oostenryck
<luc.vanoostenryck@gmail.com> wrote:
> By mistake, a cast to floating-pointer pointer was
> created as OP_FPCAST instead of OP_PTRCAST.
>
> Fix this by adding the missing 'else'.

That looks good. Good catch.

Chris