Author: majnemer Date: Tue Mar 22 11:44:39 2016 New Revision: 264065 URL: http://llvm.org/viewvc/llvm-project?rev=264065&view=rev Log: [MS ABI] Assign an inheritance model for the dest of a member pointer upcast
While we correctly assigned an inheritance model for the source of a member pointer upcast, we did not do so for the destination. This fixes PR27030. Added: cfe/trunk/test/CodeGenCXX/pr27030.cpp Modified: cfe/trunk/lib/Sema/SemaCast.cpp Modified: cfe/trunk/lib/Sema/SemaCast.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCast.cpp?rev=264065&r1=264064&r2=264065&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaCast.cpp (original) +++ cfe/trunk/lib/Sema/SemaCast.cpp Tue Mar 22 11:44:39 2016 @@ -1402,8 +1402,10 @@ TryStaticMemberPointerUpcast(Sema &Self, // Lock down the inheritance model right now in MS ABI, whether or not the // pointee types are the same. - if (Self.Context.getTargetInfo().getCXXABI().isMicrosoft()) + if (Self.Context.getTargetInfo().getCXXABI().isMicrosoft()) { (void)Self.isCompleteType(OpRange.getBegin(), SrcType); + (void)Self.isCompleteType(OpRange.getBegin(), DestType); + } // T == T, modulo cv if (!Self.Context.hasSameUnqualifiedType(SrcMemPtr->getPointeeType(), Added: cfe/trunk/test/CodeGenCXX/pr27030.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pr27030.cpp?rev=264065&view=auto ============================================================================== --- cfe/trunk/test/CodeGenCXX/pr27030.cpp (added) +++ cfe/trunk/test/CodeGenCXX/pr27030.cpp Tue Mar 22 11:44:39 2016 @@ -0,0 +1,17 @@ +// RUN: %clang_cc1 -emit-llvm -triple=i386-pc-win32 %s -o - | FileCheck %s +struct A {}; +struct B : A {}; +extern "C" { +extern int B::*a; +void test1() { (int A::*)(a); } +} +// CHECK-LABEL: define void @test1( +// CHECK: %[[load:.*]] = load i32, i32* @a +// CHECK: %[[memptr_cmp:.*]] = icmp ne i32 %[[load]], -1 +// CHECK: br i1 %[[memptr_cmp]] + +// CHECK: %[[adj:.*]] = sub nsw i32 %[[load]], 0 +// CHECK: %[[nv_adj:.*]] = select i1 true, i32 %[[adj]], i32 0 +// CHECK: br label %memptr.converted + +// CHECK: %[[memptr_converted:.*]] = phi i32 [ -1, {{.*}} ], [ %[[nv_adj]], {{.*}} ] _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits