codegen: Properly compare string if binary-expression contains string-literal

Found by -Werror=address

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 1610dad0b30b757975ab0c024247e1ff5070b4a2..0628807fd24abe566c81ee895be7e3c29c21cf6b 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -5694,10 +5694,11 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        }
                }
 
-               if (!(expr.left.value_type is NullType)
-                   && expr.left.value_type.compatible (string_type)
-                   && !(expr.right.value_type is NullType)
-                   && expr.right.value_type.compatible (string_type)) {
+               bool is_string_comparison = !(expr.left.value_type is NullType) && expr.left.value_type.compatible (string_type)
+                       && !(expr.right.value_type is NullType) && expr.right.value_type.compatible (string_type);
+               bool has_string_literal = (expr.left is StringLiteral || expr.right is StringLiteral);
+
+               if (is_string_comparison || (has_string_literal && expr.operator != BinaryOperator.PLUS)) {
                        if (expr.operator == BinaryOperator.PLUS) {
                                // string concatenation
                                if (expr.left.is_constant () && expr.right.is_constant ()) {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc386d6354cf519f21365474041c285e70565aa5..4f12d128ba0fe8c14cd35956bac4c4b789024aee 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -565,6 +565,7 @@ TESTS = \
        generics/inference-static-function.vala \
        generics/integer-type-cast.vala \
        generics/parameter-sizeof-initializer.vala \
+       generics/string-literal-comparison.vala \
        generics/type-parameter-properties.vala \
        generics/bug640330.test \
        generics/bug640330.vala \

diff --git a/tests/generics/string-literal-comparison.vala b/tests/generics/string-literal-comparison.vala
new file mode 100644 (file)
index 0000000..b1e6c2e
--- /dev/null
+++ b/tests/generics/string-literal-comparison.vala
@@ -0,0 +1,10 @@
+class Foo<G> {
+       public Foo (G g) {
+               assert (g == "foo");
+       }
+}
+
+void main () {
+       var s = "foo";
+       var foo = new Foo<string> (s);
+}