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

[Douglas Gregor]

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?

	- Doug