PR11410 - Confusing diagnostic when trailing array element tries to call deleted default constructor

[nikola]

Summary

First change tries to fix the carret in the error diagnostic that points to leading brace of the initializer list. Kind (InitializationKind) variable is used to diagnose only initializer list elements that weren't specified, and as such it seems to make more sense to use the closing brace when pointing to where the error occurred. I'm not seeing any regression so I'm not sure if this is the right approach. We could pass both leading and trailing brace to Kind and Diagnose method could then choose which one to use for each failure type?

Second change is the note that explains where this default constructor comes from. It really feels like this code belongs inside Diagnose method but that method seems to deal only with the inner initializer list element and information about the whole initializer list (number of elements) doesn't seem to be available.

[rsmith]

Please add some testcases (you can check the location is right by putting the } on a line by itself).

[nikola]

Added test.

[rsmith]

LGTM

[nikola]

Done in r209869.

include/clang/Basic/DiagnosticSemaKinds.td

   InGroup<Uninitialized>, DefaultIgnore;
 def note_block_var_fixit_add_initialization : Note<
   "maybe you meant to use __block %0">;
+def note_omitted_element_default_constructed : Note<
+  "initializer list shorter than initialized object, omitted element was "
+  "implicitly default constructed">;
 def note_var_fixit_add_initialization : Note<
   "initialize the variable %0 to silence this warning">;
 def note_uninit_fixit_remove_cond : Note<

lib/Sema/SemaInit.cpp

                                             bool &RequiresSecondPass) {
   assert((ILE->getType() != SemaRef.Context.VoidTy) &&
          "Should not have void type");
-  SourceLocation Loc = ILE->getLocStart();
-  if (ILE->getSyntacticForm())
-    Loc = ILE->getSyntacticForm()->getLocStart();
 
   if (const RecordType *RType = ILE->getType()->getAs<RecordType>()) {
     const RecordDecl *RDecl = RType->getDecl();

   } else
     ElementType = ILE->getType();
 
+  SourceLocation Loc = ILE->getLocEnd();
+  if (ILE->getSyntacticForm())
+    Loc = ILE->getSyntacticForm()->getLocEnd();
 
   for (unsigned Init = 0; Init != NumElements; ++Init) {
     if (hadError)

       InitializationSequence InitSeq(SemaRef, ElementEntity, Kind, None);
       if (!InitSeq) {
         InitSeq.Diagnose(SemaRef, ElementEntity, Kind, None);
+        if (NumInits < NumElements &&
+            InitSeq.getFailureKind() ==
+              InitializationSequence::FK_ConstructorOverloadFailed &&
+            InitSeq.getFailedOverloadResult() == OverloadingResult::OR_Deleted)
+          SemaRef.Diag(Loc, diag::note_omitted_element_default_constructed);
         hadError = true;
         return;
       }

test/SemaCXX/cxx0x-initializer-constructor.cpp

   };
   B *p = new ({123}) B;
 }
+
+namespace PR11410 {
+  struct A {
+    A() = delete; // expected-note {{deleted here}}
+    A(int);
+  };
+
+  A a[3] = {
+    {1}, {2}
+  }; // expected-error {{call to deleted constructor}} expected-note {{implicitly default constructed}}
+}