PR c++/85141 - ICE with compound assignment and static member fn.

	* typeck.c (cp_build_modify_expr): Call decay_conversion for RHS of
	compound assignment.

From-SVN: r259089

gcc/cp/ChangeLog

 2018-04-04  Jason Merrill  <jason@redhat.com>
 
+	PR c++/85141 - ICE with compound assignment and static member fn.
+	* typeck.c (cp_build_modify_expr): Call decay_conversion for RHS of
+	compound assignment.
+
 	PR c++/85148 - ICE with 'this' in array NSDMI.
 	* tree.c (replace_placeholders_r): Use handled_component_p.
 

gcc/cp/typeck.c

@@ -8083,7 +8083,7 @@ cp_build_modify_expr (location_t loc, tree lhs, enum tree_code modifycode,
 	     side effect associated with any single compound assignment
 	     operator. -- end note ]  */
 	  lhs = cp_stabilize_reference (lhs);
-	  rhs = rvalue (rhs);
+	  rhs = decay_conversion (rhs, complain);
 	  if (rhs == error_mark_node)
 	    return error_mark_node;
 	  rhs = stabilize_expr (rhs, &init);

gcc/testsuite/g++.dg/expr/assign2.C

+// PR c++/85141
+// { dg-options "-w -fpermissive" }
+
+struct A
+{
+  static int foo();
+};
+
+void bar(int i)
+{
+  i += A().foo;
+}

gcc/testsuite/g++.dg/parse/crash60.C

@@ -10,5 +10,5 @@ void foo()
   int result = 0;
   M m;
 
-  result += m.pop();  // { dg-error "invalid operands|in evaluation" }
+  result += m.pop();  // { dg-error "" }
 }