Changeset c331406 for src/tests

Timestamp:

Aug 5, 2016, 11:03:04 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a2f920f

Parents:

5070fe4 (diff), 1b0020a (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 changes from master

Location:

src/tests

Files:

• .expect/64/extension.txt (modified) (1 diff)
• .expect/multiDimension.txt (added)
• init_once.c (modified) (2 diffs)
• multiDimension.c (added)
• switch.c (modified) (2 diffs)

src/tests/.expect/64/extension.txt

@@ -100 +100 @@
     ((void)((__extension__ __a__i_2 , __extension__ __b__i_2) , __extension__ __c__i_2));
 }
-__attribute__ ((constructor(),)) static void _init_extension(void){
-    int _global_init0;
-    ((void)((*((int *)(&__a__i_1)))=_global_init0) /* ?{} */);
-    int _global_init1;
-    ((void)((*((int *)(&__b__i_1)))=_global_init1) /* ?{} */);
-    int _global_init2;
-    ((void)((*((int *)(&__c__i_1)))=_global_init2) /* ?{} */);
-}
-__attribute__ ((destructor(),)) static void _destroy_extension(void){
-    ((void)((*((int *)(&__c__i_1)))) /* ^?{} */);
-    ((void)((*((int *)(&__b__i_1)))) /* ^?{} */);
-    ((void)((*((int *)(&__a__i_1)))) /* ^?{} */);
-}

src/tests/init_once.c

@@ -92 +92 @@
 init_once y = x;
 
+void static_variable() {
+        static init_once x;
+}
+
 int main() {
         // local variables
@@ -179 +183 @@
                 }
         }
+
+        // function-scoped static variable
+        for (int i = 0; i < 10; i++) {
+                static_variable();
+        }
 }
 

src/tests/switch.c

@@ -10 +10 @@
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 30 14:41:32 2016
-// Update Count     : 30
+// Last Modified On : Thu Aug  4 11:44:29 2016
+// Update Count     : 31
 // 
 
@@ -39 +39 @@
           case 4:
                 j = 0;
+        }
+
+        switch ( i ) {
+          case 1, 2, 3:
+                switch ( i ) {
+                  case 2, 3, 4:
+                        7;
+                }
         }