[cfe-commits] r60845 - in /cfe/trunk: lib/AST/ASTContext.cpp test/SemaObjC/method-conflict.m

[steve naroff]

On Dec 10, 2008, at 4:01 PM, Douglas Gregor wrote:

> Hi Steve,
>
> On Dec 10, 2008, at 12:07 PM, Steve Naroff wrote:
>
>> Author: snaroff
>> Date: Wed Dec 10 14:07:25 2008
>> New Revision: 60845
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=60845&view=rev
>> Log:
>> Fix <rdar://problem/6424347> clang on xcode: Assertion failed: (0  
>> && "unexpected type"), function mergeTypes,
>>
>> Added:
>>   cfe/trunk/test/SemaObjC/method-conflict.m
>> Modified:
>>   cfe/trunk/lib/AST/ASTContext.cpp
>
> This test is failing for me on SL, even after recompiling with your  
> commit. Any idea what's going on?
>

I am getting the error now too. I could swear I verified this before  
my commit.

In any event, I will investigate/fix. Sorry!

snaroff


> 	- Doug