Changeset 933f32f for tests/raii

Timestamp:

May 24, 2019, 10:19:41 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

Location:

tests/raii

Files:

• .expect/ctor-autogen-ERR1.txt (modified) (4 diffs)
• init_once.cfa (modified) (2 diffs)

tests/raii/.expect/ctor-autogen-ERR1.txt

@@ -1 @@
-raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Cast of:
+raii/ctor-autogen.cfa:102:1 error: Unique best alternative includes deleted identifier in Generated Cast of:
   Application of
     Deleted Expression
@@ -27 +27 @@
 
             ... to arguments
-              Cast of:
+              Generated Cast of:
                 Member Expression, with field:
                   x: signed int
                 ... from aggregate:
-                  Cast of:
+                  Generated Cast of:
                     Variable Expression: m: reference to instance of struct Managed with body 1
                   ... to:
@@ -37 +37 @@
               ... to:
                 reference to signed int
-              Cast of:
+              Generated Cast of:
                 constant expression (0 0: zero_t)
               ... to:
@@ -48 +48 @@
 
   ... to arguments
-    Cast of:
+    Generated Cast of:
       Variable Expression: x: instance of struct Managed with body 1
     ... to:

tests/raii/init_once.cfa

@@ -10 +10 @@
 // Created On       : Tue Jun 14 15:43:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul  9 11:30:29 2016
-// Update Count     : 3
+// Last Modified On : Fri Mar 22 13:41:26 2019
+// Update Count     : 4
 //
 
@@ -192 +192 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa init_once.c" //
+// compile-command: "cfa init_once.cfa" //
 // End: //