pike.git/ src/ pike_types.cmod

2022-05-07

2022-05-07 16:18:03 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 23cea22fe8aace4a5715c03675140174d1a33e8d (48 lines) (+21/-27) ^{[ Show | Annotate ]}
  Branch: master

Compiler [Typechecker]: Survive cyclical types.

4577:    debug_malloc_pass(REMAP), \    AFLAGS, BFLAGS, REMAP_FLAGS)))   #endif /* DEBUG_MALLOC */ - #ifdef PIKE_DEBUG -  struct pike_type **save_type_stackp = Pike_compiler->type_stackp; -  struct pike_type ***save_mark_stackp = Pike_compiler->pike_type_mark_stackp; - #endif +     struct pike_type *ret; -  +  DECLARE_CYCLIC();    -  +  if (BEGIN_CYCLIC3(a, b, (ptrdiff_t)op)) { + #if 0 +  END_CYCLIC(); +  +  if (op & PT_BINOP_AND) { +  return remap_markers(a, remap, remap_flags); +  } +  return NULL; + #endif +  } +  SET_CYCLIC_RET(1); +     if (remap_flags & PT_FLAG_REMAP_TRACE) {    fprintf(stderr, "low_type_binop(0x%04x, ", op);    simple_describe_type(a);
4590:    simple_describe_type(b);    fprintf(stderr, ", %p, 0x%04x, 0x%04x, 0x%02x)\n",    remap, aflags, bflags, remap_flags); -  } +        ret = debug_malloc_pass(lower_type_binop(op, a, b, remap,    aflags, bflags, remap_flags));    -  if (remap_flags & PT_FLAG_REMAP_TRACE) { +     fprintf(stderr, "ret: ");    simple_describe_type(ret);    fprintf(stderr, "\n"); -  } +     - #ifdef PIKE_DEBUG -  if ((save_type_stackp != Pike_compiler->type_stackp) || -  (save_mark_stackp != Pike_compiler->pike_type_mark_stackp)) { -  fprintf(stderr, "low_type_binop stack level corruption!\n" -  "op : 0x%x\na: ", op); -  simple_describe_type(a); -  fprintf(stderr, "\nb: "); -  simple_describe_type(b); -  fprintf(stderr, "\nret: "); -  simple_describe_type(ret); -  fprintf(stderr, "\n\n"); -  -  Pike_fatal("Stack level corruption!\n" -  "type stack: %p (expected: %p)\n" -  "mark stack: %p (expected: %p)\n", -  Pike_compiler->type_stackp, save_type_stackp, -  Pike_compiler->pike_type_mark_stackp, save_mark_stackp); +  END_CYCLIC(); +  return ret;    } - #endif +     -  +  ret = debug_malloc_pass(lower_type_binop(op, a, b, remap, +  aflags, bflags, remap_flags)); +  END_CYCLIC();    return ret;   }   static struct pike_type *lower_type_binop(enum pt_binop op,