Changeset b81fd95 for tests

Timestamp:

Jul 29, 2020, 11:29:01 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0c760db

Parents:

1d17939

Message:

Fix bug where pointer and reference types allow unsound initialization and return. Fixes #189

There are two instances of the same basic change, which is using conversionCost instead of castCost for resolving...
A: an InitExpr?, always; affects variable initializations
B: a CastExpr?, for type-system-generated casts only; affects function returns

Changing the behaviour of the typechecker on initialization (do A) and cast (do B):
src/ResolvExpr/AlternativeFinder.cc
src/SynTree/Expression.h
testsinit1.*

Making type of string literal consistent with how C defines it (accommodate A):
src/Parser/ExpressionNode.cc

Making type system happy with incumbent use of void* (accommodate A):
libcfa/src/concurrency/kernel.cfa
libcfa/src/containers/list.hfa
tests/bugs/66.cfa
tests/avltree/avl1.cfa
tests/concurrent/signal/block.cfa
tests/searchsort.cfa

Making type system happy with incumbent plan-9 downcast (accommodate B):
libcfa/src/containers/list.hfa

Fixing previously incorrect constness of declarations (accommodate A):
tests/exceptions/defaults.cfa
libcfa/src/iostream.hfa

Fixing previously incorrect isGenerated classification of casts that desugaring introduces (accommodate B):
src/Concurrency/Keywords.cc
src/Concurrency/Waitfor.cc

Working around trac #207 (revealed by A):
tests/io2.cfa

Working around trac #208 (speculatively created by B):
libcfa/src/bits/locks.hfa
libcfa/src/concurrency/preemption.cfa

Misc:
tests/exceptions/conditional.cfa (accommodate A)

a _msg function for an exception was declared with wrong return type, so it was not compatible for assignment into the vtable instance

libcfa/src/stdlib.hfa

the compiler now prohibits a prior attempt to call a nonexistent realloc overload; calling alloc_align in its place

Location:

tests

Files:

• .expect/init1.txt (added)
• avltree/avl1.cfa (modified) (1 diff)
• bugs/66.cfa (modified) (1 diff)
• concurrent/signal/block.cfa (modified) (1 diff)
• exceptions/conditional.cfa (modified) (1 diff)
• exceptions/defaults.cfa (modified) (2 diffs)
• init1.cfa (added)
• io2.cfa (modified) (1 diff)
• searchsort.cfa (modified) (1 diff)

tests/avltree/avl1.cfa

@@ -24 +24 @@
 tree(K, V) * create(K key, V value) {
   // infinite loop trying to resolve ... t = malloc();
-  tree(K, V) * t = malloc(sizeof(tree(K,V)));
+  tree(K, V) * t = ( tree(K, V) * ) malloc(sizeof(tree(K,V)));
   (*t){ key, value };
   return t;

tests/bugs/66.cfa

@@ -5 +5 @@
 
 int main() {
-        int * next = (void*)0;
+        int * next = 0p;
         if( next ) {
                 return 1;

tests/concurrent/signal/block.cfa

@@ -82 +82 @@
         if( !is_empty( cond ) ) {
 
-                $thread * next = front( cond );
+                $thread * next = ( $thread * ) front( cond );
 
                 if( ! signal_block( cond ) ) {

tests/exceptions/conditional.cfa

@@ -17 +17 @@
 };
 
-void num_error_msg(num_error * this) {
+const char * num_error_msg(num_error * this) {
     if ( ! this->msg ) {
         static const char * base = "Num Error with code: X";

tests/exceptions/defaults.cfa

@@ -13 +13 @@
 }
 
-char * get_log_message(log_message * this) {
+const char * get_log_message(log_message * this) {
         return this->msg;
 }
@@ -28 +28 @@
         // We can catch log:
         try {
-                throwResume (log_message){(char *)"Should be printed.\n"};
+                throwResume (log_message){"Should be printed.\n"};
         } catchResume (log_message * this) {
                 printf("%s", this->virtual_table->msg(this));
         }
         // But we don't have to:
-        throwResume (log_message){(char *)"Should not be printed.\n"};
+        throwResume (log_message){"Should not be printed.\n"};
 }
 

tests/io2.cfa

@@ -121 +121 @@
 
         [int, int, const char *, double] t3 = { 3, 4, "a", 7.2 };
-        sout | [ 3, 4, "a", 7.2 ];
+        sout | [ 3, 4, (const char*)"a", 7.2 ];             // workaround trac#207: the const cast should not be needed
         sout | t3;
         sepSetTuple( sout, " " );

tests/searchsort.cfa

@@ -38 +38 @@
         } // for
         sout | nl;
-        for ( i; 0 ~ size ) {           // C version
+        for ( i; 0 ~ size ) {           // C version, returns void*
                 int key = size - i;
-                int * v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
+                int * v = ( int * ) bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
                 sout | key | ':' | *v | ", ";
         } // for