Tidy unary() a bit

factor code a bit for transforming tokens into SValues.  This revealed
a bug in TOK_GET (see testcase), which happened to be harmless before.
So fix that as well.

1 files changed, 21 insertions, 2 deletions

diff --git a/tests/tcctest.c b/tests/tcctest.c
index aee0120..e86a2a6 100644
--- a/tests/tcctest.c
+++ b/tests/tcctest.c
@@ -3720,8 +3720,6 @@ typedef struct __attribute__((__packed__)) {
     int c;
 } Spacked2;
 Spacked2 spacked2;
-/* This doesn't work for now.  Requires adjusting field offsets/sizes
-   after parsing the struct members.  */
 typedef struct Spacked3_s {
     char a;
     short b;
@@ -3754,3 +3752,24 @@ void * __attribute__((__unused__)) get_void_ptr (void *a)
 {
   return a;
 }
+
+/* This part checks for a bug in TOK_GET (used for inline expansion),
+   where the large long long constant left the the high bits set for
+   the integer constant token.  */
+static inline
+int __get_order(unsigned long long size)
+{
+  int order;
+  size -= 0xffff880000000000ULL; // this const left high bits set in the token
+    {
+      struct S { int i : 1; } s; // constructed for this '1'
+    }
+  order = size;
+  return order;
+}
+
+/* This just forces the above inline function to be actually emitted.  */
+int force_get_order(unsigned long s)
+{
+    return __get_order(s);
+}