Fix: sure operator broken

src/codegen/expr.c

@@ -1,4 +1,3 @@
-
 #include <limits.h>
 
 #include "phase.h"
@@ -1933,7 +1932,9 @@ void visit_sure( struct codegen* codegen, struct result* result,
    if ( ! sure->already_safe ) {
       write_null_check( codegen );
    }
-   result->ref = operand.ref;
+   result->ref = sure->ref;
+   result->dim = operand.dim;
+   result->diminfo_start = operand.diminfo_start;
    result->structure = operand.structure;
    result->storage = operand.storage;
    result->index = operand.index;

src/parse/expr.c

@@ -1162,6 +1162,7 @@ void read_sure( struct parse* parse, struct expr_reading* reading ) {
    sure->node.type = NODE_SURE;
    sure->pos = parse->tk_pos;
    sure->operand = reading->node;
+   sure->ref = NULL;
    sure->already_safe = false;
    reading->node = &sure->node;
    p_read_tk( parse );

src/semantic/expr.c

@@ -2105,36 +2105,20 @@ void test_sure( struct semantic* semantic, struct expr_test* test,
       semantic->lib->uses_nullable_refs = true;
    }
    else {
-      //if ( type.ref->nullable ) {
-         size_t size = 0;
-         switch ( type.ref->type ) {
-         case REF_STRUCTURE:
-            size = sizeof( struct ref_struct );
-            break;
-         case REF_ARRAY:
-            size = sizeof( struct ref_array );
-            break;
-         case REF_FUNCTION:
-            size = sizeof( struct ref_func );
-            break;
-         default:
-            UNREACHABLE();
-         }
-         result->ref = &test->temp_ref.ref;
-         memcpy( result->ref, type.ref, size );
-      //}
-      //else {
-     //    result->ref = type.ref;
-      if ( type.ref->nullable ) {
-         result->ref->nullable = false;
+      sure->ref = s_dup_ref( type.ref );
+      if ( sure->ref->nullable ) {
+         sure->ref->nullable = false;
          semantic->lib->uses_nullable_refs = true;
       }
       else {
          sure->already_safe = true;
       }
+      result->ref = sure->ref;
       result->structure = type.structure;
       result->enumeration = type.enumeration;
       result->spec = type.spec;
+      result->data_origin = operand.data_origin;
+      result->storage = operand.storage;
       result->complete = true;
       result->usable = true;
    }

src/semantic/phase.h

@@ -215,5 +215,6 @@ struct object* s_get_ns_object( struct ns* ns, const char* object_name,
 bool s_is_enumerator( struct type_info* type );
 bool s_is_null( struct type_info* type );
 bool s_in_msgbuild_block( struct semantic* semantic );
+struct ref* s_dup_ref( struct ref* ref );
 
 #endif

src/semantic/type.c

@@ -18,7 +18,6 @@ static void present_param_list( struct param* param, struct str* string );
 static bool is_array_ref_type( struct type_info* type );
 static void subscript_array_type( struct semantic* semantic,
    struct type_info* type, struct type_info* element_type );
-static struct ref* dup_ref( struct ref* ref );
 
 void s_init_type_info( struct type_info* type, struct ref* ref,
    struct structure* structure, struct enumeration* enumeration,
@@ -489,7 +488,7 @@ void subscript_array_type( struct semantic* semantic, struct type_info* type,
 void s_take_type_snapshot( struct type_info* type,
    struct type_snapshot* snapshot ) {
    if ( type->implicit_ref ) {
-      snapshot->ref = dup_ref( type->ref );
+      snapshot->ref = s_dup_ref( type->ref );
    }
    else {
       snapshot->ref = type->ref;
@@ -500,7 +499,7 @@ void s_take_type_snapshot( struct type_info* type,
    snapshot->spec = type->spec;
 }
 
-struct ref* dup_ref( struct ref* ref ) {
+struct ref* s_dup_ref( struct ref* ref ) {
    size_t size = 0;
    switch ( ref->type ) {
    case REF_ARRAY: size = sizeof( struct ref_array ); break;

src/task.h

@@ -518,6 +518,7 @@ struct sure {
    struct node node;
    struct pos pos;
    struct node* operand;
+   struct ref* ref;
    bool already_safe;
 };