Merge pull request #24 from scolin/scolin-misc-fixes

kerneis · kerneis · commit 936b04103eb5 · 2016-04-03T21:06:24.000+02:00
This pull request solves two minor bugs and a more important one
diff --git a/src/frontc/cparser.mly b/src/frontc/cparser.mly
@@ -1542,7 +1542,11 @@ asmopname:
 
 asmclobber:
     /* empty */                         { [] }
-| COLON asmcloberlst_ne                 { $2 }
+| COLON asmcloberlst                    { $2 }
+;
+asmcloberlst:
+    /* empty */                         { [] }
+| asmcloberlst_ne                       { $1 }
 ;
 asmcloberlst_ne:
    one_string_constant                           { [$1] }
diff --git a/src/mergecil.ml b/src/mergecil.ml
@@ -993,6 +993,34 @@ class renameVisitorClass = object (self)
        * variable. Must do its type and attributes. *)
   method vvdec (vi: varinfo) = DoChildren
 
+  method vglob (g: global) : global list visitAction =
+    match g with
+    | GVar(v, init, loc) ->
+       let update_init glob =
+	 match glob with
+	 | GVar(u, uinit, loc) -> GVar(u, u.vinit, loc)
+	 | _ -> glob
+       in
+       let update_all_inits = List.map update_init in
+       let () =
+	 match v.vinit.init, init.init with
+	 | None, None -> ()
+	 (* This case may happen when a definition is encountered, but
+	    the variable was already seen through a declaration and thus
+	    has no definition *)
+	 | None, Some(_) -> v.vinit.init <- init.init
+	 (* The following case should never happen because it should never be emitted *)
+	 | Some(_), None -> assert false
+	 (* The following case is either never emitted (same
+	    initializations, or different initializations but an error is
+	    thrown) or emitted when first encountering a definition
+	    (hence the initializations are supposed to be identical) *)
+	 | Some(_), Some(_) -> ()
+       in
+       ChangeDoChildrenPost([g], update_all_inits)
+    | _ -> DoChildren
+
+
       (* This is a variable use. See if we must change it *)
   method vvrbl (vi: varinfo) : varinfo visitAction = 
     if not vi.vglob then DoChildren else
diff --git a/test/Makefile b/test/Makefile
@@ -363,6 +363,14 @@ mergestruct: $(TESTDIR)/small2/mergestruct1.c $(TESTDIR)/small2/mergestruct2.c
 	  $(CILLY) mergestruct1.c mergestruct2.c -o mergestruct.exe
 	$(TESTDIR)/small2/mergestruct.exe
 
+# sc: this tests for a merger bug in global variables initializations
+mergeinit: $(TESTDIR)/small2/mergeinit1.h $(TESTDIR)/small2/mergeinit1.c \
+           $(TESTDIR)/small2/mergeinit2.h $(TESTDIR)/small2/mergeinit2_1_reftable.c $(TESTDIR)/small2/mergeinit2_2_definition.c \
+           $(TESTDIR)/small2/mergeinit3.h $(TESTDIR)/small2/mergeinit3.c \
+           $(TESTDIR)/small2/mergeinit4.c
+	cd $(TESTDIR)/small2; \
+	  $(CILLY) --merge --strictcheck --keepunused mergeinit1.c mergeinit2_1_reftable.c mergeinit2_2_definition.c mergeinit3.c mergeinit4.c
+
 # sm: yet another merger test (I know there's a target somewhere)
 mergeinline: $(TESTDIR)/small2/mergeinline1.c $(TESTDIR)/small2/mergeinline2.c
 	cd $(TESTDIR)/small2; \
diff --git a/test/small1/asm_emptyclobberallowed.c b/test/small1/asm_emptyclobberallowed.c
@@ -0,0 +1,8 @@
+
+int main(){
+  asm ("xor %%eax, %%eax"
+       : /* No outputs. */
+       : /* No inputs */
+       : );
+  return(0);
+}
diff --git a/test/small2/mergeinit1.c b/test/small2/mergeinit1.c
@@ -0,0 +1,7 @@
+
+int f1(void)
+{
+	return(1);
+}
+
+
diff --git a/test/small2/mergeinit1.h b/test/small2/mergeinit1.h
@@ -0,0 +1,2 @@
+
+extern int f1(void);
diff --git a/test/small2/mergeinit2.h b/test/small2/mergeinit2.h
@@ -0,0 +1,2 @@
+
+extern int (*table[2])();
diff --git a/test/small2/mergeinit2_1_reftable.c b/test/small2/mergeinit2_1_reftable.c
@@ -0,0 +1,2 @@
+#include "mergeinit2.h"
+
diff --git a/test/small2/mergeinit2_2_definition.c b/test/small2/mergeinit2_2_definition.c
@@ -0,0 +1,10 @@
+#include "mergeinit1.h"
+#include "mergeinit2.h"
+#include "mergeinit3.h"
+
+
+int (*table[2])(void) =
+{
+      &f1,
+      &f3
+};
diff --git a/test/small2/mergeinit3.c b/test/small2/mergeinit3.c
@@ -0,0 +1,7 @@
+
+int f3(void)
+{
+	return(3);
+}
+
+
diff --git a/test/small2/mergeinit3.h b/test/small2/mergeinit3.h
@@ -0,0 +1,2 @@
+
+extern int f3(void);
diff --git a/test/small2/mergeinit4.c b/test/small2/mergeinit4.c
@@ -0,0 +1,5 @@
+#include "mergeinit2.h"
+
+int main(){
+	return(table[0]());
+}
diff --git a/test/testcil.pl b/test/testcil.pl
@@ -198,6 +198,7 @@ sub addToGroup {
 addTest("test/asm2 _GNUCC=1");
 addTest("test/asm3 _GNUCC=1");
 addTest("test/asm4 _GNUCC=1");
+addTest("test/asm_emptyclobberallowed _GNUCC=1");
 addTest("testobj/asm5 _GNUCC=1");
 
 addTest("testrun/offsetof");
@@ -653,6 +654,9 @@ sub addToGroup {
 # tests of things implemented for EDG compatibility
 addTest("mergestruct");
 
+# Test for a merge bug in global variables initializations
+addTest("mergeinit");
+
 # a few things that should fail
 addTest("test-bad/trivial-tb");
 addTest("runall/runall_misc");

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
++
 +int f1(void)
 +{
 +	return(1);
 +}
++
++