Revert type_id to 32 bit; add 64 bit serialise_id

ponylang · Nov 30, 2018 · 3b9c8bb · 3b9c8bb
1 parent 456c780
commit 3b9c8bb
Show file tree

Hide file tree

Showing 29 changed files with 274 additions and 281 deletions.
diff --git a/src/libponyc/ast/ast.c b/src/libponyc/ast/ast.c
@@ -1977,12 +1977,11 @@ static void ast_signature_serialise(pony_ctx_t* ctx, void* object, void* buf,
 
 static pony_type_t ast_signature_pony =
 {
-  0,
-  0,
   0,
   sizeof(ast_signature_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   ast_signature_serialise_trace,
@@ -2057,12 +2056,11 @@ static void ast_nominal_pkg_id_signature_serialise(pony_ctx_t* ctx,
 
 static pony_type_t ast_nominal_pkg_id_signature_pony =
 {
-  0,
-  0,
   0,
   sizeof(ast_signature_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   ast_nominal_pkg_id_signature_serialise_trace,
@@ -2321,12 +2319,11 @@ static void ast_deserialise(pony_ctx_t* ctx, void* object)
 
 static pony_type_t ast_pony =
 {
-  0,
-  0,
   0,
   sizeof(ast_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   ast_serialise_trace,

diff --git a/src/libponyc/ast/source.c b/src/libponyc/ast/source.c
@@ -110,12 +110,11 @@ static void source_deserialise(pony_ctx_t* ctx, void* object)
 
 static pony_type_t source_pony =
 {
-  0,
-  0,
   0,
   sizeof(source_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   source_serialise_trace,

diff --git a/src/libponyc/ast/stringtab.c b/src/libponyc/ast/stringtab.c
@@ -136,7 +136,6 @@ static __pony_thread_local struct _pony_type_t string_pony =
   0,
   0,
   0,
-  0,
   NULL,
   NULL,
   NULL,
@@ -218,12 +217,11 @@ static void strlist_deserialise(pony_ctx_t* ctx, void* object)
 
 static pony_type_t strlist_pony =
 {
-  0,
-  0,
   0,
   sizeof(strlist_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   strlist_serialise_trace,

diff --git a/src/libponyc/ast/symtab.c b/src/libponyc/ast/symtab.c
@@ -377,12 +377,11 @@ static void symbol_deserialise(pony_ctx_t* ctx, void* object)
 
 static pony_type_t symbol_pony =
 {
-  0,
-  0,
   0,
   sizeof(symbol_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   symbol_serialise_trace,

diff --git a/src/libponyc/ast/token.c b/src/libponyc/ast/token.c
@@ -399,12 +399,11 @@ static void token_signature_serialise(pony_ctx_t* ctx, void* object, void* buf,
 
 static pony_type_t token_signature_pony =
 {
-  0,
-  0,
   0,
   sizeof(token_signature_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   token_signature_serialise_trace,
@@ -454,12 +453,11 @@ static void token_docstring_signature_serialise(pony_ctx_t* ctx, void* object,
 
 static pony_type_t token_docstring_signature_pony =
 {
-  0,
-  0,
   0,
   sizeof(token_signature_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   token_docstring_signature_serialise_trace,
@@ -543,12 +541,11 @@ static void token_deserialise(pony_ctx_t* ctx, void* object)
 
 static pony_type_t token_pony =
 {
-  0,
-  0,
   0,
   sizeof(token_t),
   0,
   0,
+  0,
   NULL,
   NULL,
   token_serialise_trace,

diff --git a/src/libponyc/codegen/codegen.h b/src/libponyc/codegen/codegen.h
@@ -184,6 +184,7 @@ typedef struct compile_t
   LLVMValueRef primitives_final;
   LLVMValueRef desc_table;
   LLVMValueRef desc_table_offset_lookup_fn;
+  LLVMValueRef numeric_sizes;
 
   LLVMTypeRef void_type;
   LLVMTypeRef i1;
-Original file line number
+Diff line change
@@ Expand Up @@
     static pony_type_t source_pony =
     {
-,
-,
 ,
       sizeof(source_t),
 ,
 ,
+,
       NULL,
       NULL,
       source_serialise_trace,
@@ Expand Down @@