Re: r308722 - Fixed failing assert in code completion.

2017-08-08 Thread Hans Wennborg via cfe-commits
Sorry for the slow reply; I missed this somehow.

Merged in r310395.

Thanks,
Hans

On Tue, Aug 8, 2017 at 5:20 AM, Alex L  wrote:
> Ping?
>
> On 21 July 2017 at 10:44, Alex L  wrote:
>>
>> Hans, can you please merge this to the LLVM 5.0 branch?
>>
>> AFAIK It's a recent regression that should get fixed in LLVM 5.0.
>>
>> Cheers,
>> Alex
>>
>>
>> On 21 July 2017 at 10:24, Ilya Biryukov via cfe-commits
>>  wrote:
>>>
>>> Author: ibiryukov
>>> Date: Fri Jul 21 02:24:00 2017
>>> New Revision: 308722
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=308722=rev
>>> Log:
>>> Fixed failing assert in code completion.
>>>
>>> Summary:
>>> The code was accessing uninstantiated default argument.
>>> This resulted in failing assertion at ParmVarDecl::getDefaultArg().
>>>
>>> Reviewers: erikjv, klimek, bkramer, krasimir
>>>
>>> Reviewed By: krasimir
>>>
>>> Subscribers: cfe-commits
>>>
>>> Differential Revision: https://reviews.llvm.org/D35682
>>>
>>> Added:
>>> cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
>>> Modified:
>>> cfe/trunk/lib/Sema/SemaCodeComplete.cpp
>>>
>>> Modified: cfe/trunk/lib/Sema/SemaCodeComplete.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCodeComplete.cpp?rev=308722=308721=308722=diff
>>>
>>> ==
>>> --- cfe/trunk/lib/Sema/SemaCodeComplete.cpp (original)
>>> +++ cfe/trunk/lib/Sema/SemaCodeComplete.cpp Fri Jul 21 02:24:00 2017
>>> @@ -2401,10 +2401,7 @@ formatBlockPlaceholder(const PrintingPol
>>>  static std::string GetDefaultValueString(const ParmVarDecl *Param,
>>>   const SourceManager ,
>>>   const LangOptions ) {
>>> -  const Expr *defaultArg = Param->getDefaultArg();
>>> -  if (!defaultArg)
>>> -return "";
>>> -  const SourceRange SrcRange = defaultArg->getSourceRange();
>>> +  const SourceRange SrcRange = Param->getDefaultArgRange();
>>>CharSourceRange CharSrcRange =
>>> CharSourceRange::getTokenRange(SrcRange);
>>>bool Invalid = CharSrcRange.isInvalid();
>>>if (Invalid)
>>>
>>> Added: cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp?rev=308722=auto
>>>
>>> ==
>>> --- cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp (added)
>>> +++ cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp Fri Jul 21
>>> 02:24:00 2017
>>> @@ -0,0 +1,13 @@
>>> +template 
>>> +struct unique_ptr {
>>> +  typedef T* pointer;
>>> +
>>> +  void reset(pointer ptr = pointer());
>>> +};
>>> +
>>> +void test() {
>>> +  unique_ptr x;
>>> +  x.
>>> +  // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:10:5 %s -o - |
>>> FileCheck -check-prefix=CHECK-CC1 %s
>>> +  // CHECK-CC1: [#void#]reset({#<#unique_ptr::pointer ptr =
>>> pointer()#>#})
>>> +}
>>>
>>>
>>> ___
>>> cfe-commits mailing list
>>> cfe-commits@lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>>
>>
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: r308722 - Fixed failing assert in code completion.

2017-08-08 Thread Alex L via cfe-commits
Ping?

On 21 July 2017 at 10:44, Alex L  wrote:

> Hans, can you please merge this to the LLVM 5.0 branch?
>
> AFAIK It's a recent regression that should get fixed in LLVM 5.0.
>
> Cheers,
> Alex
>
>
> On 21 July 2017 at 10:24, Ilya Biryukov via cfe-commits <
> cfe-commits@lists.llvm.org> wrote:
>
>> Author: ibiryukov
>> Date: Fri Jul 21 02:24:00 2017
>> New Revision: 308722
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=308722=rev
>> Log:
>> Fixed failing assert in code completion.
>>
>> Summary:
>> The code was accessing uninstantiated default argument.
>> This resulted in failing assertion at ParmVarDecl::getDefaultArg().
>>
>> Reviewers: erikjv, klimek, bkramer, krasimir
>>
>> Reviewed By: krasimir
>>
>> Subscribers: cfe-commits
>>
>> Differential Revision: https://reviews.llvm.org/D35682
>>
>> Added:
>> cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
>> Modified:
>> cfe/trunk/lib/Sema/SemaCodeComplete.cpp
>>
>> Modified: cfe/trunk/lib/Sema/SemaCodeComplete.cpp
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaC
>> odeComplete.cpp?rev=308722=308721=308722=diff
>> 
>> ==
>> --- cfe/trunk/lib/Sema/SemaCodeComplete.cpp (original)
>> +++ cfe/trunk/lib/Sema/SemaCodeComplete.cpp Fri Jul 21 02:24:00 2017
>> @@ -2401,10 +2401,7 @@ formatBlockPlaceholder(const PrintingPol
>>  static std::string GetDefaultValueString(const ParmVarDecl *Param,
>>   const SourceManager ,
>>   const LangOptions ) {
>> -  const Expr *defaultArg = Param->getDefaultArg();
>> -  if (!defaultArg)
>> -return "";
>> -  const SourceRange SrcRange = defaultArg->getSourceRange();
>> +  const SourceRange SrcRange = Param->getDefaultArgRange();
>>CharSourceRange CharSrcRange = CharSourceRange::getTokenRange
>> (SrcRange);
>>bool Invalid = CharSrcRange.isInvalid();
>>if (Invalid)
>>
>> Added: cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompl
>> etion/uninstantiated_params.cpp?rev=308722=auto
>> 
>> ==
>> --- cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp (added)
>> +++ cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp Fri Jul 21
>> 02:24:00 2017
>> @@ -0,0 +1,13 @@
>> +template 
>> +struct unique_ptr {
>> +  typedef T* pointer;
>> +
>> +  void reset(pointer ptr = pointer());
>> +};
>> +
>> +void test() {
>> +  unique_ptr x;
>> +  x.
>> +  // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:10:5 %s -o - |
>> FileCheck -check-prefix=CHECK-CC1 %s
>> +  // CHECK-CC1: [#void#]reset({#<#unique_ptr::pointer ptr =
>> pointer()#>#})
>> +}
>>
>>
>> ___
>> cfe-commits mailing list
>> cfe-commits@lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>>
>
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: r308722 - Fixed failing assert in code completion.

2017-07-21 Thread Alex L via cfe-commits
Hans, can you please merge this to the LLVM 5.0 branch?

AFAIK It's a recent regression that should get fixed in LLVM 5.0.

Cheers,
Alex

On 21 July 2017 at 10:24, Ilya Biryukov via cfe-commits <
cfe-commits@lists.llvm.org> wrote:

> Author: ibiryukov
> Date: Fri Jul 21 02:24:00 2017
> New Revision: 308722
>
> URL: http://llvm.org/viewvc/llvm-project?rev=308722=rev
> Log:
> Fixed failing assert in code completion.
>
> Summary:
> The code was accessing uninstantiated default argument.
> This resulted in failing assertion at ParmVarDecl::getDefaultArg().
>
> Reviewers: erikjv, klimek, bkramer, krasimir
>
> Reviewed By: krasimir
>
> Subscribers: cfe-commits
>
> Differential Revision: https://reviews.llvm.org/D35682
>
> Added:
> cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
> Modified:
> cfe/trunk/lib/Sema/SemaCodeComplete.cpp
>
> Modified: cfe/trunk/lib/Sema/SemaCodeComplete.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaC
> odeComplete.cpp?rev=308722=308721=308722=diff
> 
> ==
> --- cfe/trunk/lib/Sema/SemaCodeComplete.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaCodeComplete.cpp Fri Jul 21 02:24:00 2017
> @@ -2401,10 +2401,7 @@ formatBlockPlaceholder(const PrintingPol
>  static std::string GetDefaultValueString(const ParmVarDecl *Param,
>   const SourceManager ,
>   const LangOptions ) {
> -  const Expr *defaultArg = Param->getDefaultArg();
> -  if (!defaultArg)
> -return "";
> -  const SourceRange SrcRange = defaultArg->getSourceRange();
> +  const SourceRange SrcRange = Param->getDefaultArgRange();
>CharSourceRange CharSrcRange = CharSourceRange::getTokenRange
> (SrcRange);
>bool Invalid = CharSrcRange.isInvalid();
>if (Invalid)
>
> Added: cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompl
> etion/uninstantiated_params.cpp?rev=308722=auto
> 
> ==
> --- cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp (added)
> +++ cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp Fri Jul 21
> 02:24:00 2017
> @@ -0,0 +1,13 @@
> +template 
> +struct unique_ptr {
> +  typedef T* pointer;
> +
> +  void reset(pointer ptr = pointer());
> +};
> +
> +void test() {
> +  unique_ptr x;
> +  x.
> +  // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:10:5 %s -o - |
> FileCheck -check-prefix=CHECK-CC1 %s
> +  // CHECK-CC1: [#void#]reset({#<#unique_ptr::pointer ptr =
> pointer()#>#})
> +}
>
>
> ___
> cfe-commits mailing list
> cfe-commits@lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


r308722 - Fixed failing assert in code completion.

2017-07-21 Thread Ilya Biryukov via cfe-commits
Author: ibiryukov
Date: Fri Jul 21 02:24:00 2017
New Revision: 308722

URL: http://llvm.org/viewvc/llvm-project?rev=308722=rev
Log:
Fixed failing assert in code completion.

Summary:
The code was accessing uninstantiated default argument.
This resulted in failing assertion at ParmVarDecl::getDefaultArg().

Reviewers: erikjv, klimek, bkramer, krasimir

Reviewed By: krasimir

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D35682

Added:
cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
Modified:
cfe/trunk/lib/Sema/SemaCodeComplete.cpp

Modified: cfe/trunk/lib/Sema/SemaCodeComplete.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCodeComplete.cpp?rev=308722=308721=308722=diff
==
--- cfe/trunk/lib/Sema/SemaCodeComplete.cpp (original)
+++ cfe/trunk/lib/Sema/SemaCodeComplete.cpp Fri Jul 21 02:24:00 2017
@@ -2401,10 +2401,7 @@ formatBlockPlaceholder(const PrintingPol
 static std::string GetDefaultValueString(const ParmVarDecl *Param,
  const SourceManager ,
  const LangOptions ) {
-  const Expr *defaultArg = Param->getDefaultArg();
-  if (!defaultArg)
-return "";
-  const SourceRange SrcRange = defaultArg->getSourceRange();
+  const SourceRange SrcRange = Param->getDefaultArgRange();
   CharSourceRange CharSrcRange = CharSourceRange::getTokenRange(SrcRange);
   bool Invalid = CharSrcRange.isInvalid();
   if (Invalid)

Added: cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp?rev=308722=auto
==
--- cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp (added)
+++ cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp Fri Jul 21 02:24:00 
2017
@@ -0,0 +1,13 @@
+template 
+struct unique_ptr {
+  typedef T* pointer;
+
+  void reset(pointer ptr = pointer());
+};
+
+void test() {
+  unique_ptr x;
+  x.
+  // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:10:5 %s -o - | 
FileCheck -check-prefix=CHECK-CC1 %s
+  // CHECK-CC1: [#void#]reset({#<#unique_ptr::pointer ptr = pointer()#>#})
+}


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits