Changeset 0b18db7 for tests

Timestamp:

Oct 14, 2020, 10:58:14 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

223a633, d21dd3cb, f1791a4

Parents:

290553a (diff), 8fd0ce3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/init1-ERROR.txt (added)
• .expect/init1.txt (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• alloc.cfa (modified) (2 diffs)
• errors/.expect/completeType.x64.txt (modified) (1 diff)
• errors/.expect/completeType.x86.txt (modified) (1 diff)
• init1.cfa (modified) (5 diffs)

tests/.expect/init1.txt

@@ -1 @@
-error: No reasonable alternatives for expression Untyped Init Expression
-  Name: rx  InitAlternative: reference to signed int
-error: No reasonable alternatives for expression Untyped Init Expression
-  Name: px  InitAlternative: pointer to signed int
-error: No reasonable alternatives for expression Untyped Init Expression
-  Name: crx  InitAlternative: reference to float
-error: No reasonable alternatives for expression Untyped Init Expression
-  Name: cpx  InitAlternative: pointer to float
-init1.cfa:94:1 error: No reasonable alternatives for expression Generated Cast of:
-  Name: rx
-... to:
-  reference to signed int
-init1.cfa:97:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: ?{}
-...to:
-  Generated Cast of:
-    Variable Expression: _retval_f_py: pointer to signed int
-  ... to:
-    reference to pointer to signed int
-  Name: px
-
-init1.cfa:104:1 error: No reasonable alternatives for expression Generated Cast of:
-  Name: crx
-... to:
-  reference to float
-init1.cfa:107:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: ?{}
-...to:
-  Generated Cast of:
-    Variable Expression: _retval_f_py2: pointer to float
-  ... to:
-    reference to pointer to float
-  Name: cpx
-
-init1.cfa:114:1 error: No reasonable alternatives for expression Generated Cast of:
-  Name: s
-... to:
-  reference to instance of type T (not function type)
-init1.cfa:118:1 error: No reasonable alternatives for expression Applying untyped:
-  Name: ?{}
-...to:
-  Generated Cast of:
-    Variable Expression: _retval_anycvt: pointer to instance of type T (not function type)
-  ... to:
-    reference to pointer to instance of type T (not function type)
-  Name: s
-
+init1.cfa: In function '_X4mainFi___1':
+init1.cfa:136:9: note: #pragma message: Compiled

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sun Sep 27 19:01:41 2020
-## Update Count     : 84
+## Last Modified On : Fri Oct  9 23:13:07 2020
+## Update Count     : 86
 ###############################################################################
 
@@ -141 +141 @@
 
 SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator forall \
-        limits nested-types stdincludes cast labelledExit array builtins/sync warnings/self-assignment
+        init1 limits nested-types stdincludes cast labelledExit array builtins/sync warnings/self-assignment
 $(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
         $(CFACOMPILE_SYNTAX)
@@ -149 +149 @@
 # use custom target since they require a custom define *and* have a name that doesn't match the file
 alloc-ERROR : alloc.cfa $(CFACCBIN)
+        $(CFACOMPILE_SYNTAX) -DERR1
+        -cp $(test) $(abspath ${@})
+
+init1-ERROR : init1.cfa $(CFACCBIN)
         $(CFACOMPILE_SYNTAX) -DERR1
         -cp $(test) $(abspath ${@})

tests/alloc.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 14 16:59:59 2020
-// Update Count     : 430
+// Last Modified On : Fri Oct  9 23:03:11 2020
+// Update Count     : 431
 //
 
@@ -362 +362 @@
         ip = memset( stp, 10 );
         ip = memcpy( &st1, &st );
-#endif
+#endif // ERR1
 } // main
 

tests/errors/.expect/completeType.x64.txt

@@ -132 +132 @@
 ?=?: pointer to function
         ... with parameters
-          reference to instance of type _109_0_T (not function type)
-          instance of type _109_0_T (not function type)
+          reference to instance of type _110_0_T (not function type)
+          instance of type _110_0_T (not function type)
         ... returning
-          _retval__operator_assign: instance of type _109_0_T (not function type)
+          _retval__operator_assign: instance of type _110_0_T (not function type)
           ... with attributes:
             Attribute with name: unused

tests/errors/.expect/completeType.x86.txt

@@ -132 +132 @@
 ?=?: pointer to function
         ... with parameters
-          reference to instance of type _108_0_T (not function type)
-          instance of type _108_0_T (not function type)
+          reference to instance of type _109_0_T (not function type)
+          instance of type _109_0_T (not function type)
         ... returning
-          _retval__operator_assign: instance of type _108_0_T (not function type)
+          _retval__operator_assign: instance of type _109_0_T (not function type)
           ... with attributes:
             Attribute with name: unused

tests/init1.cfa

@@ -9 +9 @@
 // Author           : Michael Brooks
 // Created On       : Thu Jul 16 22:00:00 2020
-// Last Modified By : Michael Brooks
-// Last Modified On : Thu Jul 16 22:00:00 2020
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Oct 11 10:26:50 2020
+// Update Count     : 8
 //
 
@@ -41 +41 @@
     const float * cpx2 = cpx;
 
+    // FIX ME: Code gen not producing correct cast.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
+    int (* fp)( int ) = 0p;
+    fp = 0p;
+#pragma GCC diagnostic pop
+
     //
     // unsound initializations
     //
 
+    #ifdef ERR1
     // mismatched referenced type
     int & ry = rx;
@@ -52 +60 @@
     float & ry2 = crx;
     float * py2 = cpx;
+    #endif // ERR1
 }
 
@@ -90 +99 @@
 //
 
+#ifdef ERR1
 int & f_ry() { 
     float & rx = *0p;
@@ -119 +129 @@
     return s;               // mismatched referenced type
 }
+#endif // ERR1
+
+int main() {
+    #pragma message( "Compiled" )                       // force non-empty .expect file
+}