I merged both of them and tweaked the test case to make it work. On Tue, Aug 18, 2015 at 2:55 PM, Hans Wennborg <h...@chromium.org> wrote:
> On Tue, Aug 11, 2015 at 9:40 AM, Hans Wennborg <h...@chromium.org> wrote: > > On Mon, Aug 10, 2015 at 12:39 PM, Reid Kleckner via cfe-commits > > <cfe-commits@lists.llvm.org> wrote: > >> Author: rnk > >> Date: Mon Aug 10 14:39:01 2015 > >> New Revision: 244488 > >> > >> URL: http://llvm.org/viewvc/llvm-project?rev=244488&view=rev > >> Log: > >> [dllimport] A non-imported class with an imported key can't have a key > >> > >> Summary: > >> The vtable takes its DLL storage class from the class, not the key > >> function. When they disagree, the vtable won't be exported by the DLL > >> that defines the key function. The easiest way to ensure that importers > >> of the class emit their own vtable is to say that the class has no key > >> function. > >> > >> Reviewers: hans, majnemer > >> > >> Subscribers: cfe-commits > >> > >> Differential Revision: http://reviews.llvm.org/D11913 > > > > Should we merge this and r244266 to 3.7? > > As pointed out on the r244266 thread, these patches are still not > merged as the tests don't pass on 3.7. I was hoping someone more > familiar with the patches could take a look. >
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits