Revision 6e23543bc477eb46e5fc8d5cab119190b990ed7c authored by Keno Fischer on 24 November 2023, 15:26:51 UTC, committed by GitHub on 24 November 2023, 15:26:51 UTC
This is cherry-picked from #52245. This is an independent bugfix, and looks like #52245 might need another round of discussion. There were two separate off-by-1's in the codegen code that is trying to detect assignments to slots inside try/catch regions. First, it was asking to include the value of the catch label, which is actually the first statement *not* in the try region. Second, there was a confusion of 0 and 1 based indexing in the iteration bounds. The end result of this was that the code was also looking at the first two statements of the catch region. This wasn't a problem before #52245 (other than a potentially over-conservative marking of some slots as volatile), because our catch blocks always had at least two statements (a :leave and a terminator), but with the `:leave` change, it is possible to have catch blocks with only one statement. If these happened to be at the end of the function, things would blow up. As a side node, this code isn't particularly sound, because it assumes that try/catch regions are lexical, which they are not. The assumption happens to work out ok for the code we generate in the frontend and optimized IR doesn't have slots, so we don't use this code, but it is not in general sound.
1 parent a386cd1
serialize.h
// This file is a part of Julia. License is MIT: https://julialang.org/license
#ifndef JL_SERIALIZE_H
#define JL_SERIALIZE_H
#ifdef __cplusplus
extern "C" {
#endif
#define TAG_SYMBOL 2
#define TAG_SSAVALUE 3
#define TAG_DATATYPE 4
#define TAG_SLOTNUMBER 5
#define TAG_SVEC 6
#define TAG_ARRAY 7
#define TAG_NULL 8
#define TAG_EXPR 9
#define TAG_PHINODE 10
#define TAG_PHICNODE 11
#define TAG_LONG_SYMBOL 12
#define TAG_LONG_SVEC 13
#define TAG_LONG_EXPR 14
#define TAG_LONG_PHINODE 15
#define TAG_LONG_PHICNODE 16
#define TAG_METHODROOT 17
#define TAG_STRING 18
#define TAG_SHORT_INT64 19
#define TAG_SHORT_GENERAL 20
#define TAG_CNULL 21
#define TAG_ARRAY1D 22
#define TAG_SINGLETON 23
#define TAG_MODULE 24
#define TAG_TVAR 25
#define TAG_METHOD_INSTANCE 26
#define TAG_METHOD 27
#define TAG_CODE_INSTANCE 28
#define TAG_COMMONSYM 29
#define TAG_NEARBYGLOBAL 30
#define TAG_GLOBALREF 31
#define TAG_CORE 32
#define TAG_BASE 33
#define TAG_BITYPENAME 34
#define TAG_NEARBYMODULE 35
#define TAG_INT32 36
#define TAG_INT64 37
#define TAG_UINT8 38
#define TAG_VECTORTY 39
#define TAG_PTRTY 40
#define TAG_LONG_SSAVALUE 41
#define TAG_LONG_METHODROOT 42
#define TAG_SHORTER_INT64 43
#define TAG_SHORT_INT32 44
#define TAG_CALL1 45
#define TAG_CALL2 46
#define TAG_LINEINFO 47
#define TAG_SHORT_BACKREF 48
#define TAG_BACKREF 49
#define TAG_UNIONALL 50
#define TAG_GOTONODE 51
#define TAG_QUOTENODE 52
#define TAG_GENERAL 53
#define TAG_GOTOIFNOT 54
#define TAG_RETURNNODE 55
#define TAG_ARGUMENT 56
#define TAG_RELOC_METHODROOT 57
#define TAG_BINDING 58
#define TAG_MEMORYT 59
#define LAST_TAG 59
#define write_uint8(s, n) ios_putc((n), (s))
#define read_uint8(s) ((uint8_t)ios_getc((s)))
#define write_int8(s, n) write_uint8((s), (n))
#define read_int8(s) read_uint8((s))
/* read and write in host byte order */
static inline void write_int32(ios_t *s, int32_t i) JL_NOTSAFEPOINT
{
ios_write(s, (char*)&i, 4);
}
static inline int32_t read_int32(ios_t *s) JL_NOTSAFEPOINT
{
int32_t x = 0;
ios_read(s, (char*)&x, 4);
return x;
}
static inline uint64_t read_uint64(ios_t *s) JL_NOTSAFEPOINT
{
uint64_t x = 0;
ios_read(s, (char*)&x, 8);
return x;
}
static inline void write_uint64(ios_t *s, uint64_t i) JL_NOTSAFEPOINT
{
ios_write(s, (char*)&i, 8);
}
static inline void write_uint16(ios_t *s, uint16_t i) JL_NOTSAFEPOINT
{
ios_write(s, (char*)&i, 2);
}
static inline uint16_t read_uint16(ios_t *s) JL_NOTSAFEPOINT
{
int16_t x = 0;
ios_read(s, (char*)&x, 2);
return x;
}
static inline void write_uint32(ios_t *s, uint32_t i) JL_NOTSAFEPOINT
{
ios_write(s, (char*)&i, 4);
}
static inline uint32_t read_uint32(ios_t *s) JL_NOTSAFEPOINT
{
uint32_t x = 0;
ios_read(s, (char*)&x, 4);
return x;
}
#ifdef _P64
#define write_uint(s, i) write_uint64(s, i)
#else
#define write_uint(s, i) write_uint32(s, i)
#endif
#ifdef _P64
#define read_uint(s) read_uint64(s)
#else
#define read_uint(s) read_uint32(s)
#endif
void *jl_lookup_ser_tag(jl_value_t *v);
void *jl_lookup_common_symbol(jl_value_t *v);
jl_value_t *jl_deser_tag(uint8_t tag);
jl_value_t *jl_deser_symbol(uint8_t tag);
#ifdef __cplusplus
}
#endif
#endif /* JL_SERIALIZE_H */
Computing file changes ...
